diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index 4021eaa4d3..f29dc30ffe 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -42,7 +42,10 @@
       </div>
     </fieldset>
 
-    <%= submit_tag t('diary_entry.edit.save_button') %>
-    <%# TODO: button should say 'publish' or 'save changes' depending on new/edit state %>
+    <% if action_name == 'new' %>
+      <%= submit_tag t('diary_entry.new.publish_button') %>
+    <% else %>
+      <%= submit_tag t('diary_entry.edit.save_button') %>
+    <% end %>
   </div>
 <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3e3905298a..795611a0c6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -248,6 +248,7 @@ en:
   diary_entry:
     new:
       title: New Diary Entry
+      publish_button: "Publish"
     list:
       title: "Users' diaries"
       title_friends: "Friends' diaries"