diff --git a/manifests/init.pp b/manifests/init.pp
index ad7b646..3836c24 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,7 +2,7 @@
 #
 class mediawiki(
   $mediawiki_location         = '/srv/mediawiki/w',
-  $mediawiki_images_location  = '/srv/mediawiki/images',
+  $mediawiki_images_location  = '/srv/mediawiki-data/images',
   $role                       = 'all',
   $site_hostname              = $::fqdn,
   $serveradmin                = "webmaster@${::fqdn}",
@@ -39,6 +39,15 @@ class mediawiki(
       ensure => directory,
     }
 
+    file { '/srv/mediawiki-data':
+      ensure => directory,
+    }
+
+    file { $mediawiki_images_location:
+      ensure  => directory,
+      require => File['/srv/mediawiki-data'],
+    }
+
     file { '/srv/mediawiki/Settings.php':
       ensure  => file,
       content => template('mediawiki/Settings.php.erb'),
diff --git a/templates/Settings.php.erb b/templates/Settings.php.erb
index 82f8e9c..c5fe4b9 100644
--- a/templates/Settings.php.erb
+++ b/templates/Settings.php.erb
@@ -106,7 +106,7 @@ $wgAllowUserJs = true;
 $wgEnableUploads  = false;
 $wgUseImageMagick = true;
 $wgImageMagickConvertCommand = "/usr/bin/convert";
-$wgUploadDirectory = "/srv/mediawiki/images";
+$wgUploadDirectory = "<%= @mediawiki_images_location %>";
 $wgFileExtensions[] = 'svg';
 
 # InstantCommons allows wiki to use images from http://commons.wikimedia.org