diff --git a/dpaste/settings/__init__.py b/dpaste/settings/__init__.py
index f5492f1..488aee4 100644
--- a/dpaste/settings/__init__.py
+++ b/dpaste/settings/__init__.py
@@ -74,12 +74,9 @@ STATIC_ROOT = os.path.join(VAR_ROOT, 'static')
 # Project URLS and media settings
 #==============================================================================
 
-MEDIA_URL = '/uploads/'
 STATIC_URL = '/static/'
 ADMIN_MEDIA_PREFIX = '/static/admin/'
 
-MEDIA_ROOT = os.path.join(VAR_ROOT, 'uploads')
-
 ROOT_URLCONF = 'dpaste.urls'
 
 LOGIN_URL = '/accounts/login/'
diff --git a/server/logrotate.conf b/server/logrotate.conf
index ee333a6..ead7ea0 100644
--- a/server/logrotate.conf
+++ b/server/logrotate.conf
@@ -1,7 +1,8 @@
 /srv/dpaste.de/var/*.log {
-	monthly
+    monthly
     rotate 52
     dateext
+    create
     missingok
-	compress
+    compress
 }
diff --git a/server/nginx.conf b/server/nginx.conf
index 03bb0d9..873120e 100644
--- a/server/nginx.conf
+++ b/server/nginx.conf
@@ -78,10 +78,6 @@ server {
         auth_basic_user_file /srv/dpaste.de/var/.htpasswd;
     }
 
-    location /media/ {
-        alias /srv/dpaste.de/var/media/;
-    }
-
     location /static/ {
         alias /srv/dpaste.de/var/static/;
     }