============================================================
--- conf/distro/angstrom-2007.1.conf    c6bbfa10816eda24513e92b21827c75003bb4daa
+++ conf/distro/angstrom-2007.1.conf    508cc6d61d863e169c13b5ff0295b66f3608f6de
@@ -224,7 +224,6 @@ EXTRA_STUFF ?= ""


 # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
-# contains ipkg specific stuff as well :(

 #work around a bitbake bug where mtd-utils-native isn't created so do_rootfs fails
 DISTRO_EXTRA_DEPENDS += " \
@@ -235,7 +234,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     update-modules \
     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \
     angstrom-version \
-    ipkg ipkg-collateral \
     util-linux-mount util-linux-umount \
     ${EXTRA_STUFF} \
     ${DEBUG_APPS} \
============================================================
--- packages/images/minimal-image.bb    c74056146aaed6f3e2cd64879f504ea6920efb59
+++ packages/images/minimal-image.bb    dc0caa8692fe8e856f0e752e6d88fe50851fe435
@@ -1,12 +1,14 @@ DISTRO_SSH_DAEMON ?= "dropbear"
 #Angstrom minimalist image
 #gives you a small images with ssh access

 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"

 IMAGE_INSTALL = "task-boot \
             util-linux-mount util-linux-umount \
             ${DISTRO_SSH_DAEMON} \
+            ${DISTRO_PACKAGE_MANAGER} \
             angstrom-version \
           "

============================================================
--- packages/tasks/task-base.bb 6f33e4ea8083953d24993dca089ae71114f8a639
+++ packages/tasks/task-base.bb 22635c1ee42f15cae81e8d4a5b07e8dea4b07f49
@@ -64,6 +64,11 @@ DISTRO_SSH_DAEMON ?= "dropbear"
 DISTRO_SSH_DAEMON ?= "dropbear"

 #
+# ipkg, or something else
+#
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+#
 # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
 #
 PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
@@ -82,6 +87,7 @@ RDEPENDS_task-base = "\
     task-distro-base \
     task-machine-base \
     ${DISTRO_SSH_DAEMON} \
+    ${DISTRO_PACKAGE_MANAGER} \
     ${HOTPLUG} \
     \
     ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \