diff --git a/.gitignore b/.gitignore
index c85a7cba5537c8d72b3f65292c4272f1fe5c7c84..721b1f83085f073f06790828dd40393544cc44aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,3 @@ gpg/diaspora-development/*.gpg
 gpg/diaspora-production/*.gpg
 gpg/*/random_seed
 public/uploads/*
-public/public/*
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index a1b9201a1f9ee06c724b4da8fd46dd5c20370a8f..31fb5e5a2780642714128f630acc979cda4f2f9e 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -4,7 +4,7 @@ class ImageUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    "public/uploads"
+    "uploads"
   end
 
   def extension_white_list