diff --git a/lib/gollum/frontend/app.rb b/lib/gollum/frontend/app.rb
index 6c0621f4..6b5bf188 100644
--- a/lib/gollum/frontend/app.rb
+++ b/lib/gollum/frontend/app.rb
@@ -51,14 +51,15 @@ module Precious
     end
 
     post '/edit/:name' do
-      name = params[:name]
-      wiki = Gollum::Wiki.new($path)
-      page = wiki.page(name)
+      name   = params[:name]
+      wiki   = Gollum::Wiki.new($path)
+      page   = wiki.page(name)
       format = params[:format].intern
+      name   = params[:rename] if params[:rename]
 
-      wiki.update_page(page, page.name, format, params[:content], commit_message)
+      wiki.update_page(page, name, format, params[:content], commit_message)
 
-      redirect "/#{name}"
+      redirect "/#{Gollum::Page.cname name}"
     end
 
     post '/create/:name' do
diff --git a/lib/gollum/frontend/templates/edit.mustache b/lib/gollum/frontend/templates/edit.mustache
index b5a4a161..0d1ecdc7 100644
--- a/lib/gollum/frontend/templates/edit.mustache
+++ b/lib/gollum/frontend/templates/edit.mustache
@@ -2,28 +2,37 @@
   <a href="/{{name}}">&laquo; Back</a>
   <h1>Editing &ldquo;{{name}}&rdquo;</h1>
 
-  <form iclass="edit_wiki" method="post" action="/edit/{{name}}">
-    <div id="wiki-form" class="comment-form wiki-form">
-      <ul class="tabs inline-tabs">
-        <li><a href="#write_bucket" action="write">Write</a></li>
-        <li><a href="#preview_bucket" action="preview">Preview</a></li>
-      </ul>
-      <div id="write_bucket" class="tab-content">
-        {{>editbar}}
-        <div class="inner">
-          <textarea name="content">{{content}}</textarea>
+  <form class="edit_wiki" method="post" action="/edit/{{name}}">
+    <div>
+      <label>
+        Title<br />
+        <input class="text" type="text" name="rename" value="{{name}}" />
+      </label>
+      <br />
+
+      <div id="wiki-form" class="comment-form wiki-form">
+        <ul class="tabs inline-tabs">
+          <li><a href="#write_bucket" action="write">Write</a></li>
+          <li><a href="#preview_bucket" action="preview">Preview</a></li>
+        </ul>
+        <div id="write_bucket" class="tab-content">
+
+          {{>editbar}}
+          <div class="inner">
+            <textarea name="content">{{content}}</textarea>
+          </div>
+        </div>
+        <div id="preview_bucket" class="tab-content content-body content wikistyle gollum">
+          <p>Loading content...</p>
         </div>
       </div>
-      <div id="preview_bucket" class="tab-content content-body content wikistyle gollum">
-        <p>Loading content...</p>
+      <label>
+        Edit Summary <small>(Briefly describe the changes you have made)</small><br />
+        <input type="text" class="text" name="message" />
+      </label>
+      <div class="actions">
+        <input type="submit" value="Save page" />
       </div>
     </div>
-    <label>
-      Edit Summary <small>(Briefly describe the changes you have made)</small><br />
-      <input type="text" class="text" name="message" />
-    </label>
-    <div class="actions">
-      <input type="submit" value="Save page" />
-    </div>
   </form>
 </div>
\ No newline at end of file