diff --git a/app/database/migrations/2015_01_05_201444_CreateComponentsTable.php b/app/database/migrations/2015_01_05_201444_CreateComponentsTable.php
index 44195375..9a33dfab 100644
--- a/app/database/migrations/2015_01_05_201444_CreateComponentsTable.php
+++ b/app/database/migrations/2015_01_05_201444_CreateComponentsTable.php
@@ -18,7 +18,6 @@ class CreateComponentsTable extends Migration
             $table->string('name');
             $table->text('description');
             $table->text('link');
-            $table->text('tags');
             $table->integer('status');
             $table->integer('order');
             $table->integer('group_id');
diff --git a/app/database/migrations/2015_01_16_083825_CreateTagsTable.php b/app/database/migrations/2015_01_16_083825_CreateTagsTable.php
new file mode 100644
index 00000000..98b053cb
--- /dev/null
+++ b/app/database/migrations/2015_01_16_083825_CreateTagsTable.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTagsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tags', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->string('slug');
+            $table->timestamps();
+
+            $table->unique(['name', 'slug']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('tags');
+    }
+}
diff --git a/app/database/migrations/2015_01_16_084030_CreateComponentTagTable.php b/app/database/migrations/2015_01_16_084030_CreateComponentTagTable.php
new file mode 100644
index 00000000..77a7480e
--- /dev/null
+++ b/app/database/migrations/2015_01_16_084030_CreateComponentTagTable.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateComponentTagTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('component_tag', function (Blueprint $table) {
+            $table->increments('id');
+            $table->integer('component_id');
+            $table->integer('tag_id');
+
+            $table->index('component_id');
+            $table->index('tag_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('component_tag');
+    }
+}
diff --git a/app/views/dashboard/components/add.blade.php b/app/views/dashboard/components/add.blade.php
index e96a2065..78c48721 100644
--- a/app/views/dashboard/components/add.blade.php
+++ b/app/views/dashboard/components/add.blade.php
@@ -50,7 +50,7 @@
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.components.tags') }}</label>
-                            <textarea name="component[tags]" class="form-control" rows="2"></textarea>
+                            <input name="component[tags]" class="form-control" />
                             <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                         </div>
                     </fieldset>
diff --git a/app/views/dashboard/components/edit.blade.php b/app/views/dashboard/components/edit.blade.php
index 2bd1de8e..05dcb775 100644
--- a/app/views/dashboard/components/edit.blade.php
+++ b/app/views/dashboard/components/edit.blade.php
@@ -50,7 +50,7 @@
                         </div>
                         <div class="form-group">
                             <label>{{ trans('forms.components.tags') }}</label>
-                            <textarea name="component[tags]" class="form-control" rows="2">{{ $component->tags }}</textarea>
+                            <input name="component[tags]" class="form-control" value="{{ $component->tagsList }}" />
                             <span class="help-block">{{ trans('forms.components.tags-help') }}</span>
                         </div>
                     </fieldset>
diff --git a/src/Http/Controllers/DashComponentController.php b/src/Http/Controllers/DashComponentController.php
index d0c6bf0f..ae8c951f 100644
--- a/src/Http/Controllers/DashComponentController.php
+++ b/src/Http/Controllers/DashComponentController.php
@@ -4,6 +4,7 @@ namespace CachetHQ\Cachet\Http\Controllers;
 
 use CachetHQ\Cachet\Models\Component;
 use CachetHQ\Cachet\Models\ComponentGroup;
+use CachetHQ\Cachet\Models\Tag;
 use GrahamCampbell\Binput\Facades\Binput;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Redirect;
@@ -104,6 +105,7 @@ class DashComponentController extends Controller
     public function updateComponentAction(Component $component)
     {
         $_component = Binput::get('component');
+        $tags = array_pull($_component, 'tags');
         $component->update($_component);
 
         if (! $component->isValid()) {
@@ -116,6 +118,18 @@ class DashComponentController extends Controller
                 ->with('errors', $component->getErrors());
         }
 
+        // The component was added successfully, so now let's deal with the tags.
+        $tags = preg_split('/ ?, ?/', $tags);
+
+        // For every tag, do we need to create it?
+        $componentTags = array_map(function ($taggable) use ($component) {
+            return Tag::firstOrCreate([
+                'name' => $taggable,
+            ])->id;
+        }, $tags);
+
+        $component->tags()->sync($componentTags);
+
         $successMsg = sprintf(
             '<strong>%s</strong> %s',
             trans('dashboard.notifications.awesome'),
@@ -148,6 +162,9 @@ class DashComponentController extends Controller
     public function createComponentAction()
     {
         $_component = Binput::get('component');
+        // We deal with tags separately.
+        $tags = array_pull($_component, 'tags');
+
         $component = Component::create($_component);
 
         if (! $component->isValid()) {
@@ -160,6 +177,18 @@ class DashComponentController extends Controller
                 ->with('errors', $component->getErrors());
         }
 
+        // The component was added successfully, so now let's deal with the tags.
+        $tags = preg_split('/ ?, ?/', $tags);
+
+        // For every tag, do we need to create it?
+        $componentTags = array_map(function ($taggable) use ($component) {
+            return Tag::firstOrCreate([
+                'name' => $taggable,
+            ])->id;
+        }, $tags);
+
+        $component->tags()->sync($componentTags);
+
         $successMsg = sprintf(
             '<strong>%s</strong> %s',
             trans('dashboard.notifications.awesome'),
diff --git a/src/Models/Component.php b/src/Models/Component.php
index 2af21afa..b9a86256 100644
--- a/src/Models/Component.php
+++ b/src/Models/Component.php
@@ -85,6 +85,16 @@ class Component extends Model implements TransformableInterface
         return $this->hasMany('CachetHQ\Cachet\Models\Incident', 'component_id', 'id');
     }
 
+    /**
+     * Components can have many tags.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function tags()
+    {
+        return $this->belongsToMany('CachetHQ\Cachet\Models\Tag');
+    }
+
     /**
      * Finds all components by status.
      *
@@ -121,6 +131,20 @@ class Component extends Model implements TransformableInterface
         return trans('cachet.components.status.'.$this->status);
     }
 
+    /**
+     * Returns all of the tags on this component.
+     *
+     * @return string
+     */
+    public function getTagsListAttribute()
+    {
+        $tags = $this->tags->map(function ($tag) {
+            return $tag->name;
+        });
+
+        return implode(', ', $tags->toArray());
+    }
+
     /**
      * Get the transformer instance.
      *
diff --git a/src/Models/Tag.php b/src/Models/Tag.php
new file mode 100644
index 00000000..759a6015
--- /dev/null
+++ b/src/Models/Tag.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace CachetHQ\Cachet\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
+use Watson\Validating\ValidatingTrait;
+
+class Tag extends Model
+{
+    use ValidatingTrait;
+
+    /**
+     * The fillable properties.
+     *
+     * @var string[]
+     */
+    protected $fillable = ['name'];
+
+    /**
+     * Overrides the models boot method.
+     *
+     * @return void
+     */
+    public static function boot()
+    {
+        parent::boot();
+
+        self::creating(function ($tag) {
+            $tag->slug = Str::slug($tag->name);
+        });
+    }
+
+    /**
+     * Tags can have many components.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
+     */
+    public function components()
+    {
+        return $this->belongsToMany('CachetHQ\Cachet\Models\Component');
+    }
+}