diff --git a/platforms/bootusb/Makefile b/platforms/bootusb/Makefile
index 57faa7f..b3728b5 100644
--- a/platforms/bootusb/Makefile
+++ b/platforms/bootusb/Makefile
@@ -1,4 +1,4 @@
-$(MAKEDIST_TARGET)-bootusb: openmamba-release syslinux memtest86+ $(MAKEDIST_TARGET)-firmwares
+$(MAKEDIST_TARGET)-bootusb: openmamba-release syslinux memtest86+ $(MAKEDIST_TARGET)-firmwares macbook-tools
 # Localization targets
 $(MAKEDIST_TARGET)-bootusb-en:
 $(MAKEDIST_TARGET)-bootusb-it:
diff --git a/platforms/livecd-root/Makefile b/platforms/livecd-root/Makefile
index 849c8df..4d783da 100644
--- a/platforms/livecd-root/Makefile
+++ b/platforms/livecd-root/Makefile
@@ -1,8 +1,4 @@
-$(MAKEDIST_TARGET)-livecd-kde3: kdebase kmix \
-                       kppp krfb ksirc ark kcalc kdf kfloppy kgpg klaptop ksnapshot desktop-base-openmamba \
-                       kpdf kontact kmail akregator kitchensync knetworkconf kopete kdebluetooth smb4k knemo \
-                       amarok kaffeine
-$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
+$(MAKEDIST_TARGET)-livecd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
                        ksnapshot okular desktop-base-kde4 kmix4 \
                        kopete4 kdebluetooth4 smb4k juk4 lisa4 kwalletmanager4 \
                        kaffeine libqt4-sqlite kate
@@ -22,7 +18,6 @@ $(MAKEDIST_TARGET)-livecd-root: \
                   samba-server \
                   ndisgtk smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-livecd-kde4
-#                  gnome-device-manager
 #                  libopensync-plugin-syncml libopensync-plugin-google-calendar \
 #                  libopensync-plugin-gnokii libopensync-plugin-synce \
 #                  libopensync-plugin-moto libopensync-plugin-palm \
diff --git a/platforms/livecd/Makefile b/platforms/livecd/Makefile
index 3abea4d..f96b596 100644
--- a/platforms/livecd/Makefile
+++ b/platforms/livecd/Makefile
@@ -1,4 +1,4 @@
-$(MAKEDIST_TARGET)-livecd: openmamba-release memtest86+ syslinux
+$(MAKEDIST_TARGET)-livecd: openmamba-release memtest86+ syslinux macbook-tools
 # Localized targets
 $(MAKEDIST_TARGET)-livecd-en:
 $(MAKEDIST_TARGET)-livecd-it:
diff --git a/platforms/livedvd-root/Makefile b/platforms/livedvd-root/Makefile
index 6265c1c..5fd254a 100644
--- a/platforms/livedvd-root/Makefile
+++ b/platforms/livedvd-root/Makefile
@@ -1,8 +1,4 @@
-$(MAKEDIST_TARGET)-livedvd-kde3: kdebase kmix \
-                       kppp krfb ksirc ark kcalc kdf kfloppy kgpg klaptop ksnapshot desktop-base-openmamba \
-                       kpdf kontact kmail akregator kitchensync knetworkconf kopete kdebluetooth smb4k knemo \
-                       amarok kaffeine
-$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ksirk ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
+$(MAKEDIST_TARGET)-livedvd-kde4: kppp4 krfb4 ark4 kcalc4 kdf4 kfloppy4 kgpg4 desktop-base-kde4 \
                        ksnapshot okular kontact4 kmail4 akregator4 desktop-base-kde4 kmix4 \
                        kopete4 kdebluetooth4 smb4k amarok lisa4 kwalletmanager4 \
                        kaffeine libqt4-sqlite kate
@@ -19,8 +15,7 @@ $(MAKEDIST_TARGET)-livedvd-root: \
                   gparted gag ntfs-3g libdvdcss \
                   chromium totem-mozilla-plugin \
                   macbook-tools livecd-tools \
-                  Mesa-tools driconf parted testdisk \
-                  gnome-device-manager samba-server \
+                  Mesa-tools driconf parted testdisk samba-server \
                   ndisgtk smart-gui cpufreqd mambatray \
                   $(MAKEDIST_TARGET)-livedvd-kde4 toptray testdisk photorec
 #                  libopensync-plugin-syncml libopensync-plugin-google-calendar \
diff --git a/platforms/livedvd/Makefile b/platforms/livedvd/Makefile
index 8146048..041eca2 100644
--- a/platforms/livedvd/Makefile
+++ b/platforms/livedvd/Makefile
@@ -1,4 +1,4 @@
-$(MAKEDIST_TARGET)-livedvd: openmamba-release memtest86+ syslinux
+$(MAKEDIST_TARGET)-livedvd: openmamba-release memtest86+ syslinux macbook-tools
 # Localized targets
 $(MAKEDIST_TARGET)-livedvd-en:
 $(MAKEDIST_TARGET)-livedvd-it: