diff --git a/modules/reprepro/manifests/init.pp b/modules/reprepro/manifests/init.pp
index 8ecaa54f7a..43256fa1ee 100644
--- a/modules/reprepro/manifests/init.pp
+++ b/modules/reprepro/manifests/init.pp
@@ -10,22 +10,54 @@ class reprepro {
   }
 
   file {"/srv/packages":
-    owner => 'jenkins',
-    group => 'jenkins',
-    mode => 755,
-    ensure => directory,
-    require => [File["/srv"], User[jenkins]]
-  }
-
-  file {"/srv/packages/conf":
     owner => 'root',
     group => 'root',
     mode => 555,
     ensure => directory,
-    require => File["/srv/packages"],
+    require => File["/srv"],
   }
 
-  file {"/srv/packages/conf/distributions":
+  file {"/srv/packages/trunk":
+    owner => 'jenkins',
+    group => 'jenkins',
+    mode => 755,
+    ensure => directory,
+    require => [File["/srv/packages"], User[jenkins]]
+  }
+
+  file {"/srv/packages/trunk/conf":
+    owner => 'root',
+    group => 'root',
+    mode => 555,
+    ensure => directory,
+    require => File["/srv/packages/trunk"],
+  }
+
+  file {"/srv/packages/trunk/conf/distributions":
+    owner => 'root',
+    group => 'root',
+    mode => 444,
+    ensure => 'present',
+    source => "puppet:///modules/reprepro/distributions",
+  }
+
+  file {"/srv/packages/diablo":
+    owner => 'jenkins',
+    group => 'jenkins',
+    mode => 755,
+    ensure => directory,
+    require => [File["/srv/packages"], User[jenkins]]
+  }
+
+  file {"/srv/packages/diablo/conf":
+    owner => 'root',
+    group => 'root',
+    mode => 555,
+    ensure => directory,
+    require => File["/srv/packages/diablo"],
+  }
+
+  file {"/srv/packages/diablo/conf/distributions":
     owner => 'root',
     group => 'root',
     mode => 444,