-## current kernel version 2.6.31-grml:
-aufs-modules-2.6.31-grml
-drbd8-2.6.31-grml
-#fglrx-kernel-2.6.31-grml
-iscsitarget-module-2.6.31-grml
-kqemu-modules-2.6.31-grml
-linux-doc-2.6.31-grml
-linux-headers-2.6.31-grml
-linux-image-2.6.31-grml
-#linux-source-2.6.31-grml
-loop-aes-modules-2.6.31-grml
-ndiswrapper-modules-2.6.31-grml
-#nvidia-kernel-2.6.31-grml
-openafs-modules-2.6.31-grml
-sl-modem-modules-2.6.31-grml
-speakup-modules-2.6.31-grml
-sysprof-module-2.6.31-grml
-tp-smapi-modules-2.6.31-grml
-virtualbox-ose-guest-modules-2.6.31-grml virtualbox-ose-guest-utils virtualbox-ose-guest-x11
-xtables-addons-modules-2.6.31-grml
-## }}}
+# firmware updates
+fwupd-i386-signed
+
+# X - not relevant on more recent systems, so ship on i386 only
+xserver-xorg-video-intel
+
+PACKAGES install AMD64
+# kernel related
+linux-image-amd64
+linux-cpupower
+# disk subsystems support/debugging
+cciss-vol-status
+# x86 hardware support
+cmospwd
+cpuid
+memtest86+
+# broken userland debugging
+ltrace
+# disk partitioning/boot
+grub-pc-bin
+
+# PXE boot
+grml-terminalserver