diff --git a/builds/any/rootfs/jessie/common/common-packages.yml b/builds/any/rootfs/jessie/common/all-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/jessie/common/common-packages.yml
rename to builds/any/rootfs/jessie/common/all-base-packages.yml
diff --git a/builds/any/rootfs/jessie/common/amd64-packages.yml b/builds/any/rootfs/jessie/common/amd64-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/jessie/common/amd64-packages.yml
rename to builds/any/rootfs/jessie/common/amd64-base-packages.yml
diff --git a/builds/any/rootfs/jessie/common/amd64-onl-packages.yml b/builds/any/rootfs/jessie/common/amd64-onl-packages.yml
new file mode 100644
index 00000000..984f2fc3
--- /dev/null
+++ b/builds/any/rootfs/jessie/common/amd64-onl-packages.yml
@@ -0,0 +1,11 @@
+############################################################
+#
+# These packages are specific to the ONL root filesystem build.
+#
+############################################################
+- onl-upgrade
+
+
+
+
+
diff --git a/builds/any/rootfs/jessie/common/armel-packages.yml b/builds/any/rootfs/jessie/common/armel-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/jessie/common/armel-packages.yml
rename to builds/any/rootfs/jessie/common/armel-base-packages.yml
diff --git a/builds/any/rootfs/jessie/common/armel-onl-packages.yml b/builds/any/rootfs/jessie/common/armel-onl-packages.yml
new file mode 100644
index 00000000..e58df638
--- /dev/null
+++ b/builds/any/rootfs/jessie/common/armel-onl-packages.yml
@@ -0,0 +1,9 @@
+############################################################
+#
+# These packages are specific to the ONL root filesystem build.
+#
+############################################################
+- onl-loader-fit
+
+
+
diff --git a/builds/any/rootfs/jessie/common/powerpc-packages.yml b/builds/any/rootfs/jessie/common/powerpc-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/jessie/common/powerpc-packages.yml
rename to builds/any/rootfs/jessie/common/powerpc-base-packages.yml
diff --git a/builds/any/rootfs/jessie/common/powerpc-onl-packages.yml b/builds/any/rootfs/jessie/common/powerpc-onl-packages.yml
new file mode 100644
index 00000000..e58df638
--- /dev/null
+++ b/builds/any/rootfs/jessie/common/powerpc-onl-packages.yml
@@ -0,0 +1,9 @@
+############################################################
+#
+# These packages are specific to the ONL root filesystem build.
+#
+############################################################
+- onl-loader-fit
+
+
+
diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml
index c3b22d8e..ff1e4208 100644
--- a/builds/any/rootfs/jessie/standard/standard.yml
+++ b/builds/any/rootfs/jessie/standard/standard.yml
@@ -8,8 +8,9 @@
 #
 ############################################################
 Packages: &Packages
-  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/common-packages.yml
-  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-packages.yml
+  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/all-base-packages.yml
+  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-base-packages.yml
+  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-onl-packages.yml
   - !script  $ONL/tools/onl-platform-pkgs.py ${PLATFORM_LIST}
 
 Multistrap:
diff --git a/builds/any/rootfs/wheezy/common/common-packages.yml b/builds/any/rootfs/wheezy/common/all-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/wheezy/common/common-packages.yml
rename to builds/any/rootfs/wheezy/common/all-base-packages.yml
diff --git a/builds/any/rootfs/wheezy/common/amd64-packages.yml b/builds/any/rootfs/wheezy/common/amd64-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/wheezy/common/amd64-packages.yml
rename to builds/any/rootfs/wheezy/common/amd64-base-packages.yml
diff --git a/builds/any/rootfs/wheezy/common/amd64-onl-packages.yml b/builds/any/rootfs/wheezy/common/amd64-onl-packages.yml
new file mode 100644
index 00000000..984f2fc3
--- /dev/null
+++ b/builds/any/rootfs/wheezy/common/amd64-onl-packages.yml
@@ -0,0 +1,11 @@
+############################################################
+#
+# These packages are specific to the ONL root filesystem build.
+#
+############################################################
+- onl-upgrade
+
+
+
+
+
diff --git a/builds/any/rootfs/wheezy/common/powerpc-packages.yml b/builds/any/rootfs/wheezy/common/powerpc-base-packages.yml
similarity index 100%
rename from builds/any/rootfs/wheezy/common/powerpc-packages.yml
rename to builds/any/rootfs/wheezy/common/powerpc-base-packages.yml
diff --git a/builds/any/rootfs/wheezy/common/powerpc-onl-packages.yml b/builds/any/rootfs/wheezy/common/powerpc-onl-packages.yml
new file mode 100644
index 00000000..e58df638
--- /dev/null
+++ b/builds/any/rootfs/wheezy/common/powerpc-onl-packages.yml
@@ -0,0 +1,9 @@
+############################################################
+#
+# These packages are specific to the ONL root filesystem build.
+#
+############################################################
+- onl-loader-fit
+
+
+
diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml
index 4f6d1491..e7ca7cb7 100644
--- a/builds/any/rootfs/wheezy/standard/standard.yml
+++ b/builds/any/rootfs/wheezy/standard/standard.yml
@@ -8,8 +8,9 @@
 #
 ############################################################
 Packages: &Packages
-  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/common-packages.yml
-  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-packages.yml
+  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/all-base-packages.yml
+  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-base-packages.yml
+  - !include $ONL/builds/any/rootfs/$ONL_DEBIAN_SUITE/common/${ARCH}-onl-packages.yml
   - !script  $ONL/tools/onl-platform-pkgs.py ${PLATFORM_LIST}
 
 Multistrap: