diff --git a/REPO/jessie/packages/all/Makefile b/REPO/jessie/packages/binary-all/Makefile
similarity index 100%
rename from REPO/jessie/packages/all/Makefile
rename to REPO/jessie/packages/binary-all/Makefile
diff --git a/REPO/jessie/packages/amd64/Makefile b/REPO/jessie/packages/binary-amd64/Makefile
similarity index 100%
rename from REPO/jessie/packages/amd64/Makefile
rename to REPO/jessie/packages/binary-amd64/Makefile
diff --git a/REPO/jessie/packages/armel/Makefile b/REPO/jessie/packages/binary-armel/Makefile
similarity index 100%
rename from REPO/jessie/packages/armel/Makefile
rename to REPO/jessie/packages/binary-armel/Makefile
diff --git a/REPO/jessie/packages/powerpc/Makefile b/REPO/jessie/packages/binary-powerpc/Makefile
similarity index 100%
rename from REPO/jessie/packages/powerpc/Makefile
rename to REPO/jessie/packages/binary-powerpc/Makefile
diff --git a/REPO/wheezy/packages/all/Makefile b/REPO/wheezy/packages/binary-all/Makefile
similarity index 100%
rename from REPO/wheezy/packages/all/Makefile
rename to REPO/wheezy/packages/binary-all/Makefile
diff --git a/REPO/wheezy/packages/amd64/Makefile b/REPO/wheezy/packages/binary-amd64/Makefile
similarity index 100%
rename from REPO/wheezy/packages/amd64/Makefile
rename to REPO/wheezy/packages/binary-amd64/Makefile
diff --git a/REPO/wheezy/packages/powerpc/Makefile b/REPO/wheezy/packages/binary-powerpc/Makefile
similarity index 100%
rename from REPO/wheezy/packages/powerpc/Makefile
rename to REPO/wheezy/packages/binary-powerpc/Makefile
diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml
index 071dc193..4586c93f 100644
--- a/builds/any/rootfs/jessie/standard/standard.yml
+++ b/builds/any/rootfs/jessie/standard/standard.yml
@@ -43,11 +43,11 @@ Multistrap:
     omitdebsrc: true
 
   Local-All:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/all
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-all
     omitdebsrc: true
 
   Local-Arch:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/${ARCH}
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
     omitdebsrc: true
 
 Configure:
diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml
index fe72a3b8..2ec2902d 100644
--- a/builds/any/rootfs/wheezy/standard/standard.yml
+++ b/builds/any/rootfs/wheezy/standard/standard.yml
@@ -43,11 +43,11 @@ Multistrap:
     omitdebsrc: true
 
   Local-All:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/all
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-all
     omitdebsrc: true
 
   Local-Arch:
-    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/${ARCH}
+    source: ${ONL}/REPO/${ONL_DEBIAN_SUITE}/packages/binary-${ARCH}
     omitdebsrc: true
 
 Configure:
diff --git a/tools/onlpm.py b/tools/onlpm.py
index 62aff9c8..552f4f1f 100755
--- a/tools/onlpm.py
+++ b/tools/onlpm.py
@@ -605,8 +605,8 @@ class OnlPackageRepo(object):
                 package = os.path.split(underscores[0])[1]
                 # Architecture is the last entry (.deb)
                 arch = underscores[-1].split('.')[0]
-                logger.debug("+ /bin/cp %s %s/%s", p, self.repo, arch)
-                dstdir = os.path.join(self.repo, arch)
+                logger.debug("+ /bin/cp %s %s/%s", p, self.repo, "binary-" + arch)
+                dstdir = os.path.join(self.repo, "binary-" + arch)
                 if not os.path.exists(dstdir):
                     os.makedirs(dstdir)
                 logger.info("dstdir=%s"% dstdir)
@@ -637,7 +637,7 @@ class OnlPackageRepo(object):
         with self.lock:
             rv = []
             (name, arch) = OnlPackage.idparse(pkg)
-            dirname = os.path.join(self.repo, arch)
+            dirname = os.path.join(self.repo, "binary-" + arch)
             if os.path.exists(dirname):
                 manifest = os.listdir(dirname)
                 rv = [ os.path.join(dirname, x) for x in manifest if arch in x and "%s_" % name in x ]