diff --git a/.gitignore b/.gitignore
index c85a7cba5..721b1f830 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 a1b9201a1..31fb5e5a2 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