diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 9e596b56..2ea9c472 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -163,7 +163,7 @@ module Precious
         tempfile = params[:file][:tempfile]
       end
 
-      dir = 'uploads'
+      dir = wiki.per_page_uploads ? params[:upload_dest] : 'uploads'
       ext = ::File.extname(fullname)
       format = ext.split('.').last || 'txt'
       filename = ::File.basename(fullname, ext)
@@ -173,7 +173,7 @@ module Precious
       head = wiki.repo.head
 
       options = {
-        :message => "Uploaded file to uploads/#{reponame}",
+        :message => "Uploaded file to #{dir}/#{reponame}",
         :parent => wiki.repo.head.commit,
       }
       author = session['gollum.author']
@@ -447,6 +447,10 @@ module Precious
         @page = page
         @name = name
         @content  = page.formatted_data
+        @upload_dest = settings.wiki_options[:allow_uploads] ?
+                         (settings.wiki_options[:per_page_uploads] ?
+                            @name : 'uploads'
+                         ) : ''
 
         # Extensions and layout data
         @editable = true
diff --git a/lib/gollum/public/gollum/javascript/gollum.dialog.js b/lib/gollum/public/gollum/javascript/gollum.dialog.js
index a76bf3f9..0bf0e0a4 100755
--- a/lib/gollum/public/gollum/javascript/gollum.dialog.js
+++ b/lib/gollum/public/gollum/javascript/gollum.dialog.js
@@ -99,6 +99,8 @@
 
       html += '<form method=post enctype="multipart/form-data" ' +
         'action="' + action + '" ' + 'id="' + id + '">';
+      html += '<input type="hidden" name="upload_dest" value="' +
+        uploadDest + '">';
       html += '<input type=file name="' + name + '">';
       html += '</form>';
 
diff --git a/lib/gollum/public/gollum/javascript/gollum.js b/lib/gollum/public/gollum/javascript/gollum.js
index f778caec..f9ac94ce 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js
+++ b/lib/gollum/public/gollum/javascript/gollum.js
@@ -155,7 +155,7 @@ $(document).ready(function() {
         fields: [
           {
             type:   'file',
-            context: 'Your uploaded file will be accessible at /uploads/[filename]',
+            context: 'Your uploaded file will be accessible at /'+uploadDest+'/[filename]',
             action: baseUrl + '/uploadFile'
           }
         ],
diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index e49046c0..6710a610 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -17,6 +17,7 @@
       var baseUrl = '{{base_url}}';
       {{#page}}
       var pageFullPath = '{{url_path_display}}';
+      var uploadDest   = '{{upload_dest}}';
       {{/page}}
   </script>
   <script type="text/javascript" src="{{base_url}}/javascript/jquery-1.7.2.min.js"></script>
diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index a556f472..7d33e258 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -46,6 +46,10 @@ module Precious
       def allow_uploads
         @allow_uploads
       end
+      
+      def upload_dest
+        @upload_dest
+      end
 
       def has_header
         @header = (@page.header || false) if @header.nil?