diff --git a/app/views/cms/edit.rhtml b/app/views/cms/edit.rhtml
index 4fbceae..aee8956 100644
--- a/app/views/cms/edit.rhtml
+++ b/app/views/cms/edit.rhtml
@@ -28,6 +28,9 @@
 
   <%= select_categories(:article, _('Categorize your article')) %>
 
+  <%= f.text_field('tag_list', :size => 64) %>
+  <%= content_tag( 'small', _('Separate tags with commas') ) %>
+
   <div id='edit-article-options'>
     <%= options_for_article(@article) %>
   </div>
diff --git a/features/blog.feature b/features/blog.feature
index b557a65..4848b0d 100644
--- a/features/blog.feature
+++ b/features/blog.feature
@@ -87,3 +87,9 @@ Feature: blog
     And I press "Save"
     When I am on /joaosilva/blog-two
     Then I should see "Blog One"
+
+  Scenario: display tag list field when creating new blog
+    Given I follow "Control panel"
+    And I follow "Manage Content"
+    When I follow "New blog"
+    Then I should see "Tag list"
diff --git a/features/create_article.feature b/features/create_article.feature
index 802e856..68d478f 100644
--- a/features/create_article.feature
+++ b/features/create_article.feature
@@ -33,3 +33,29 @@ Feature: create article
     And I follow "New Folder"
     When I follow "Cancel"
     Then I should be on Joao Silva's cms
+
+  Scenario: display tag list field when creating event
+    Given I follow "Control panel"
+    And I follow "Manage Content"
+    And I follow "New article"
+    When I follow "Event"
+    Then I should see "Tag list"
+
+  Scenario: display tag list field when creating folder
+    Given I follow "Control panel"
+    And I follow "Manage Content"
+    When I follow "New folder"
+    Then I should see "Tag list"
+
+  Scenario: create new article with tags
+    Given I follow "Control panel"
+    And I follow "Manage Content"
+    And I follow "New article"
+    When I follow "Text article with Textile markup language"
+    Then I should see "Tag list"
+    When I fill in "Title" with "Article with tags"
+    And I fill in "Tag list" with "aurium, bug"
+    And I press "Save"
+    And I go to /joaosilva/article-with-tags
+    Then I should see "aurium" within "#article-tags a:first"
+    And I should see "bug" within "#article-tags a:last"
diff --git a/features/edit_image.feature b/features/edit_image.feature
index dba174b..0843f0a 100644
--- a/features/edit_image.feature
+++ b/features/edit_image.feature
@@ -2,26 +2,30 @@ Feature: edit_image
   As a noosfero user
   I want to upload images and assigns a link to each image
 
-  Scenario: edit external link when edit image
+  Background:
     Given I am on the homepage
     And the following users
       | login   | name   |
       | morgoth | Melkor |
-    And the following files
+    And I am logged in as "morgoth"
+
+  Scenario: edit external link when edit image
+    Given the following files
       | owner   | file      | mime      |
       | morgoth | rails.png | image/png |
-    And I am logged in as "morgoth"
     When I go to edit "rails.png" by morgoth
     Then I should see "External link"
 
   Scenario: dont offer to edit external link if no image
-    Given I am on the homepage
-    And the following users
-      | login   | name   |
-      | morgoth | Melkor |
-    And the following files
+    Given the following files
       | owner   | file     | mime       |
       | morgoth | test.txt | text/plain |
-    And I am logged in as "morgoth"
     When I go to edit "test.txt" by morgoth
     Then I should not see "External link"
+
+  Scenario: display tag list field when editing file
+    Given the following files
+      | owner   | file      | mime      |
+      | morgoth | rails.png | image/png |
+    When I go to edit "rails.png" by morgoth
+    Then I should see "Tag list"
--
libgit2 0.21.2