diff --git a/app/views/cms/_text_fields.html.erb b/app/views/cms/_text_fields.html.erb
index ca62fce..fbb72de 100644
--- a/app/views/cms/_text_fields.html.erb
+++ b/app/views/cms/_text_fields.html.erb
@@ -1 +1 @@
-<%= labelled_form_field(_('Publish date'), date_field('article[published_at]', @article.published_at || DateTime.current, {:max_date => '+0d', :date_format => 'yy-mm-dd'}, {:id => "article_published_at"})) %>
+<%= labelled_form_field(_('Publish date'), date_field('article[published_at]', @article.published_at || DateTime.current, {:max_date => '+0d', :time => true}, {:id => "article_published_at"})) %>
diff --git a/features/edit_article.feature b/features/edit_article.feature
index f02a8bc..77ad8ff 100644
--- a/features/edit_article.feature
+++ b/features/edit_article.feature
@@ -281,3 +281,16 @@ Feature: edit article
     And I press "Save"
     Then I should not see "Language must be choosen"
     And I should be on /joaosilva/article-in-portuguese
+
+  @selenium
+  Scenario: create an article with time
+    Given I am on joaosilva's control panel
+    And I follow "Manage Content"
+    And I follow "New content"
+    When I follow "Text article with visual editor"
+    And I fill in "Title" with "My time testing Article"
+    And I fill in "Publish date" with "1980-11-15 20:37"
+    And I press "Save"
+    And I go to /joaosilva/my-time-testing-article
+    Then I should see "November 15, 1980 20:37"
+
--
libgit2 0.21.2