diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index b5081473c..fb2b1699a 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,6 +1,6 @@
 class CommentsController < ApplicationController
   respond_to :html, :xml, :json
-  before_filter :member_only, :only => [:update, :create]
+  before_filter :member_only, :only => [:update, :create, :edit]
 
   def index
     if params[:group_by] == "post"
@@ -13,7 +13,7 @@ class CommentsController < ApplicationController
   def update
     @comment = Comment.find(params[:id])
     @comment.update_attributes(params[:comment])
-    respond_with(@comment)
+    respond_with(@comment, :location => post_path(@comment.post_id))
   end
   
   def create
@@ -28,6 +28,11 @@ class CommentsController < ApplicationController
     end
   end
   
+  def edit
+    @comment = Comment.find(params[:id])
+    respond_with(@comment)
+  end
+  
 private
   def index_by_post
     @posts = Post.tag_match(params[:tags]).commented_before(params[:before_date] || Time.now).limit(8)
diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb
new file mode 100644
index 000000000..9a071331d
--- /dev/null
+++ b/app/views/comments/edit.html.erb
@@ -0,0 +1,11 @@
+<div id="c-comments">
+  <div id="a-edit">
+    <h1>Edit Comment</h1>    
+    
+    <%= simple_form_for(@comment) do |f| %>
+      <%= f.input :body %>
+      <%= f.button :submit %>
+    <% end %>
+  </div>
+</div>
+
diff --git a/app/views/comments/partials/show/_comment.html.erb b/app/views/comments/partials/show/_comment.html.erb
index 870884e46..e2221d948 100644
--- a/app/views/comments/partials/show/_comment.html.erb
+++ b/app/views/comments/partials/show/_comment.html.erb
@@ -16,6 +16,7 @@
       <li><span class="link">Reply</span></li>
       <% if CurrentUser.user.is_janitor? || CurrentUser.user.id == comment.creator_id %>
         <li><%= link_to "Delete", comment_path(comment.id), :confirm => "Do you really want to delete this comment?", :method => :delete %></li>
+        <li><%= link_to "Edit", edit_comment_path(comment.id) %></li>
       <% end %>
       <li><%= link_to "Vote up", comment_votes_path(:comment_id => comment.id, :score => "up"), :method => :post, :remote => true %></li>
       <li><%= link_to "Vote down", comment_votes_path(:comment_id => comment.id, :score => "down"), :method => :post, :remote => true %></li>