diff --git a/app/controllers/user_feedbacks_controller.rb b/app/controllers/user_feedbacks_controller.rb
index 6a20d9a14..bc68ffd22 100644
--- a/app/controllers/user_feedbacks_controller.rb
+++ b/app/controllers/user_feedbacks_controller.rb
@@ -33,6 +33,13 @@ class UserFeedbacksController < ApplicationController
     respond_with(@user_feedback)
   end
 
+  def update
+    @user_feedback = UserFeedback.find(params[:id])
+    check_privilege(@user_feedback)
+    @user_feedback.update_attributes(params[:user_feedback])
+    respond_with(@user_feedback)
+  end
+
   def destroy
     @user_feedback = UserFeedback.find(params[:id])
     check_privilege(@user_feedback)
diff --git a/app/views/user_feedbacks/edit.html.erb b/app/views/user_feedbacks/edit.html.erb
index e69de29bb..a96735913 100644
--- a/app/views/user_feedbacks/edit.html.erb
+++ b/app/views/user_feedbacks/edit.html.erb
@@ -0,0 +1,23 @@
+<div id="c-user-feedbacks">
+  <div id="a-new">
+    <h1>Edit User Feedback</h1>
+
+    <div id="preview">
+    </div>
+
+    <%= error_messages_for "user_feedback" %>
+
+    <%= simple_form_for(@user_feedback) do |f| %>
+      <%= f.input :category, :collection => ["positive", "neutral", "negative"], :include_blank => false %>
+      <%= dtext_field "user_feedback", "body" %>
+      <%= f.button :submit, "Submit" %>
+      <%= dtext_preview_button "user_feedback", "body" %>
+    <% end %>
+
+    <%= render "secondary_links" %>
+  </div>
+</div>
+
+<% content_for(:page_title) do %>
+  Edit Feedback - <%= Danbooru.config.app_name %>
+<% end %>
diff --git a/app/views/user_feedbacks/index.html.erb b/app/views/user_feedbacks/index.html.erb
index 6970a4925..d6490f147 100644
--- a/app/views/user_feedbacks/index.html.erb
+++ b/app/views/user_feedbacks/index.html.erb
@@ -21,7 +21,8 @@
             <td><%= format_text(feedback.body) %></td>
             <td>
               <% if feedback.creator_id == CurrentUser.id || CurrentUser.is_moderator? %>
-                <%= link_to "delete", user_feedback_path(feedback), :method => :delete, :data => {:confirm => "Are you sure you want to delete this user feedback?"} %>
+                <%= link_to "edit", edit_user_feedback_path(feedback) %>
+                | <%= link_to "delete", user_feedback_path(feedback), :method => :delete, :data => {:confirm => "Are you sure you want to delete this user feedback?"} %>
               <% end %>
             </td>
           </tr>
diff --git a/app/views/user_feedbacks/show.html.erb b/app/views/user_feedbacks/show.html.erb
index 8c2a7f674..0d45da9bb 100644
--- a/app/views/user_feedbacks/show.html.erb
+++ b/app/views/user_feedbacks/show.html.erb
@@ -8,6 +8,10 @@
       <li><strong>Category</strong> <%= @user_feedback.category %></li>
       <li><strong>Message</strong> <%= format_text @user_feedback.body %></li>
     </ul>
+
+    <% if @user_feedback.creator_id == CurrentUser.id || CurrentUser.is_moderator? %>
+      <p><%= link_to "Edit", edit_user_feedback_path(@user_feedback) %></p>
+    <% end %>
   </div>
 </div>