diff --git a/debian/changelog b/debian/changelog
index f8dcfc8c8..de7a24b73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ linux (3.2.20-2) UNRELEASED; urgency=low
   
   [ Aurelien Jarno ]
   * [mips,mipsel] udeb: Remove rivafb and nvidiafb.
+  * [ppc64]: add udebs, based on powerpc/powerpc64.
 
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 12 Jun 2012 06:21:34 +0100
 
diff --git a/debian/installer/ppc64/kernel-versions b/debian/installer/ppc64/kernel-versions
new file mode 100644
index 000000000..359bd103c
--- /dev/null
+++ b/debian/installer/ppc64/kernel-versions
@@ -0,0 +1,2 @@
+# arch  version flavour   installedname suffix build-depends
+ppc64   -       powerpc64 -             -      -
diff --git a/debian/installer/ppc64/modules/ppc64/affs-modules b/debian/installer/ppc64/modules/ppc64/affs-modules
new file mode 100644
index 000000000..3f0e4bb90
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/affs-modules
@@ -0,0 +1,2 @@
+#include <affs-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/ata-modules b/debian/installer/ppc64/modules/ppc64/ata-modules
new file mode 100644
index 000000000..be78de0c1
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/ata-modules
@@ -0,0 +1,2 @@
+#include <ata-modules>
+libata -
diff --git a/debian/installer/ppc64/modules/ppc64/btrfs-modules b/debian/installer/ppc64/modules/ppc64/btrfs-modules
new file mode 100644
index 000000000..e261e1388
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/btrfs-modules
@@ -0,0 +1 @@
+#include <btrfs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/cdrom-core-modules b/debian/installer/ppc64/modules/ppc64/cdrom-core-modules
new file mode 100644
index 000000000..e264d7aa3
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/cdrom-core-modules
@@ -0,0 +1,2 @@
+#include <cdrom-core-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/core-modules b/debian/installer/ppc64/modules/ppc64/core-modules
new file mode 100644
index 000000000..d90987bf4
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/core-modules
@@ -0,0 +1,3 @@
+#include <core-modules>
+mbcache
+bestcomm-core ?
diff --git a/debian/installer/ppc64/modules/ppc64/crc-modules b/debian/installer/ppc64/modules/ppc64/crc-modules
new file mode 100644
index 000000000..7e00de705
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/crc-modules
@@ -0,0 +1 @@
+#include <crc-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/crypto-dm-modules b/debian/installer/ppc64/modules/ppc64/crypto-dm-modules
new file mode 100644
index 000000000..4c8f2354c
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/crypto-dm-modules
@@ -0,0 +1 @@
+#include <crypto-dm-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/crypto-modules b/debian/installer/ppc64/modules/ppc64/crypto-modules
new file mode 100644
index 000000000..3a1e862b4
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/crypto-modules
@@ -0,0 +1 @@
+#include <crypto-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/event-modules b/debian/installer/ppc64/modules/ppc64/event-modules
new file mode 100644
index 000000000..f8819afd3
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/event-modules
@@ -0,0 +1 @@
+#include <event-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/ext2-modules b/debian/installer/ppc64/modules/ppc64/ext2-modules
new file mode 100644
index 000000000..bbaebc8f1
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/ext2-modules
@@ -0,0 +1,2 @@
+#include <ext2-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/ext3-modules b/debian/installer/ppc64/modules/ppc64/ext3-modules
new file mode 100644
index 000000000..55ef7d7bc
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/ext3-modules
@@ -0,0 +1,2 @@
+#include <ext3-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/ext4-modules b/debian/installer/ppc64/modules/ppc64/ext4-modules
new file mode 100644
index 000000000..394c577ce
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/ext4-modules
@@ -0,0 +1 @@
+#include <ext4-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/fancontrol-modules b/debian/installer/ppc64/modules/ppc64/fancontrol-modules
new file mode 100644
index 000000000..f069ca199
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/fancontrol-modules
@@ -0,0 +1,14 @@
+i2c-powermac ?
+therm_pm72 ?
+windfarm_core ?
+windfarm_cpufreq_clamp ?
+windfarm_lm75_sensor ?
+windfarm_max6690_sensor ?
+windfarm_pid ?
+windfarm_pm121 ?
+windfarm_pm112 ?
+windfarm_pm81 ?
+windfarm_pm91 ?
+windfarm_smu_controls ?
+windfarm_smu_sat ?
+windfarm_smu_sensors ?
diff --git a/debian/installer/ppc64/modules/ppc64/fat-modules b/debian/installer/ppc64/modules/ppc64/fat-modules
new file mode 100644
index 000000000..cce8fd30c
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/fat-modules
@@ -0,0 +1,2 @@
+#include <fat-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/firewire-core-modules b/debian/installer/ppc64/modules/ppc64/firewire-core-modules
new file mode 100644
index 000000000..dcac80af9
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/firewire-core-modules
@@ -0,0 +1 @@
+#include <firewire-core-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/floppy-modules b/debian/installer/ppc64/modules/ppc64/floppy-modules
new file mode 100644
index 000000000..169fde52e
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/floppy-modules
@@ -0,0 +1,2 @@
+#include <floppy-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/hfs-modules b/debian/installer/ppc64/modules/ppc64/hfs-modules
new file mode 100644
index 000000000..57d12f649
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/hfs-modules
@@ -0,0 +1 @@
+#include <hfs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/hypervisor-modules b/debian/installer/ppc64/modules/ppc64/hypervisor-modules
new file mode 100644
index 000000000..29ceb6154
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/hypervisor-modules
@@ -0,0 +1,2 @@
+hvcserver
+hvcs
diff --git a/debian/installer/ppc64/modules/ppc64/input-modules b/debian/installer/ppc64/modules/ppc64/input-modules
new file mode 100644
index 000000000..51e37ced9
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/input-modules
@@ -0,0 +1,3 @@
+#include <input-modules>
+atkbd
+i8042
diff --git a/debian/installer/ppc64/modules/ppc64/irda-modules b/debian/installer/ppc64/modules/ppc64/irda-modules
new file mode 100644
index 000000000..b141b585b
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/irda-modules
@@ -0,0 +1,7 @@
+irtty-sir
+sir-dev
+ircomm-tty
+ircomm
+irda
+irlan
+irnet
diff --git a/debian/installer/ppc64/modules/ppc64/isofs-modules b/debian/installer/ppc64/modules/ppc64/isofs-modules
new file mode 100644
index 000000000..da4fa9a3c
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/isofs-modules
@@ -0,0 +1 @@
+#include <isofs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/jfs-modules b/debian/installer/ppc64/modules/ppc64/jfs-modules
new file mode 100644
index 000000000..925a43a9e
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/jfs-modules
@@ -0,0 +1,2 @@
+#include <jfs-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/kernel-image b/debian/installer/ppc64/modules/ppc64/kernel-image
new file mode 100644
index 000000000..1bb8bf6d7
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/kernel-image
@@ -0,0 +1 @@
+# empty
diff --git a/debian/installer/ppc64/modules/ppc64/loop-modules b/debian/installer/ppc64/modules/ppc64/loop-modules
new file mode 100644
index 000000000..164467713
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/loop-modules
@@ -0,0 +1,2 @@
+#include <loop-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/md-modules b/debian/installer/ppc64/modules/ppc64/md-modules
new file mode 100644
index 000000000..ade088ddb
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/md-modules
@@ -0,0 +1,2 @@
+#include <md-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/mouse-modules b/debian/installer/ppc64/modules/ppc64/mouse-modules
new file mode 100644
index 000000000..15fcb00ea
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/mouse-modules
@@ -0,0 +1 @@
+#include <mouse-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/multipath-modules b/debian/installer/ppc64/modules/ppc64/multipath-modules
new file mode 100644
index 000000000..a8b69b253
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/multipath-modules
@@ -0,0 +1 @@
+#include <multipath-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/nbd-modules b/debian/installer/ppc64/modules/ppc64/nbd-modules
new file mode 100644
index 000000000..3c9b3e5d4
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/nbd-modules
@@ -0,0 +1 @@
+#include <nbd-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/nic-extra-modules b/debian/installer/ppc64/modules/ppc64/nic-extra-modules
new file mode 100644
index 000000000..8eabd9107
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/nic-extra-modules
@@ -0,0 +1,4 @@
+#include <nic-extra-modules>
+tms380tr
+ehea
+ps3_gelic
diff --git a/debian/installer/ppc64/modules/ppc64/nic-modules b/debian/installer/ppc64/modules/ppc64/nic-modules
new file mode 100644
index 000000000..a7d0d0b36
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/nic-modules
@@ -0,0 +1,11 @@
+#include <nic-modules>
+
+ipddp
+sunhme
+airport
+sungem
+sungem_phy
+bmac ?
+ibmveth
+spidernet
+pasemi_mac ?
diff --git a/debian/installer/ppc64/modules/ppc64/nic-pcmcia-modules b/debian/installer/ppc64/modules/ppc64/nic-pcmcia-modules
new file mode 100644
index 000000000..7a0702cd5
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/nic-pcmcia-modules
@@ -0,0 +1 @@
+#include <nic-pcmcia-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/nic-shared-modules b/debian/installer/ppc64/modules/ppc64/nic-shared-modules
new file mode 100644
index 000000000..b52153dd4
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/nic-shared-modules
@@ -0,0 +1,3 @@
+8390
+mii
+libphy
diff --git a/debian/installer/ppc64/modules/ppc64/pata-modules b/debian/installer/ppc64/modules/ppc64/pata-modules
new file mode 100644
index 000000000..4c7d4296b
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/pata-modules
@@ -0,0 +1,3 @@
+#include <pata-modules>
+pata_mpc52xx ?
+pata_macio ?
diff --git a/debian/installer/ppc64/modules/ppc64/pcmcia-modules b/debian/installer/ppc64/modules/ppc64/pcmcia-modules
new file mode 100644
index 000000000..2bb5350fe
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/pcmcia-modules
@@ -0,0 +1 @@
+#include <pcmcia-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/pcmcia-storage-modules b/debian/installer/ppc64/modules/ppc64/pcmcia-storage-modules
new file mode 100644
index 000000000..9fbaff306
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/pcmcia-storage-modules
@@ -0,0 +1,2 @@
+#include <pcmcia-storage-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/ppp-modules b/debian/installer/ppc64/modules/ppc64/ppp-modules
new file mode 100644
index 000000000..f1ae9b3d1
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/ppp-modules
@@ -0,0 +1,2 @@
+#include <ppp-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/reiserfs-modules b/debian/installer/ppc64/modules/ppc64/reiserfs-modules
new file mode 100644
index 000000000..372669677
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/reiserfs-modules
@@ -0,0 +1,2 @@
+#include <reiserfs-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/sata-modules b/debian/installer/ppc64/modules/ppc64/sata-modules
new file mode 100644
index 000000000..071cb860b
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/sata-modules
@@ -0,0 +1,2 @@
+#include <sata-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-common-modules b/debian/installer/ppc64/modules/ppc64/scsi-common-modules
new file mode 100644
index 000000000..49739018c
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/scsi-common-modules
@@ -0,0 +1,2 @@
+#include <scsi-common-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-core-modules b/debian/installer/ppc64/modules/ppc64/scsi-core-modules
new file mode 100644
index 000000000..6ec85bb77
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/scsi-core-modules
@@ -0,0 +1,3 @@
+#include <scsi-core-modules>
+scsi_mod -
+scsi_transport_spi
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-extra-modules b/debian/installer/ppc64/modules/ppc64/scsi-extra-modules
new file mode 100644
index 000000000..f37aaaa3d
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/scsi-extra-modules
@@ -0,0 +1,3 @@
+#include <scsi-extra-modules>
+
+ps3disk ?
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-modules b/debian/installer/ppc64/modules/ppc64/scsi-modules
new file mode 100644
index 000000000..29722a1cd
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/scsi-modules
@@ -0,0 +1,4 @@
+#include <scsi-modules>
+
+ibmvscsic
+ps3rom
diff --git a/debian/installer/ppc64/modules/ppc64/serial-modules b/debian/installer/ppc64/modules/ppc64/serial-modules
new file mode 100644
index 000000000..6ab8b8c35
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/serial-modules
@@ -0,0 +1 @@
+#include <serial-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/squashfs-modules b/debian/installer/ppc64/modules/ppc64/squashfs-modules
new file mode 100644
index 000000000..42d77887a
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/squashfs-modules
@@ -0,0 +1 @@
+#include <squashfs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/udf-modules b/debian/installer/ppc64/modules/ppc64/udf-modules
new file mode 100644
index 000000000..b90d7ee9b
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/udf-modules
@@ -0,0 +1 @@
+#include <udf-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/ufs-modules b/debian/installer/ppc64/modules/ppc64/ufs-modules
new file mode 100644
index 000000000..69745cad0
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/ufs-modules
@@ -0,0 +1,2 @@
+#include <ufs-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/uinput-modules b/debian/installer/ppc64/modules/ppc64/uinput-modules
new file mode 100644
index 000000000..58a833779
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/uinput-modules
@@ -0,0 +1 @@
+#include <uinput-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/usb-modules b/debian/installer/ppc64/modules/ppc64/usb-modules
new file mode 100644
index 000000000..c598dedd8
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/usb-modules
@@ -0,0 +1 @@
+#include <usb-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/usb-serial-modules b/debian/installer/ppc64/modules/ppc64/usb-serial-modules
new file mode 100644
index 000000000..c0a0dc3bd
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/usb-serial-modules
@@ -0,0 +1 @@
+#include <usb-serial-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/usb-storage-modules b/debian/installer/ppc64/modules/ppc64/usb-storage-modules
new file mode 100644
index 000000000..272d95e2e
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/usb-storage-modules
@@ -0,0 +1,2 @@
+#include <usb-storage-modules>
+
diff --git a/debian/installer/ppc64/modules/ppc64/virtio-modules b/debian/installer/ppc64/modules/ppc64/virtio-modules
new file mode 100644
index 000000000..61da39659
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/virtio-modules
@@ -0,0 +1 @@
+#include <virtio-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/xfs-modules b/debian/installer/ppc64/modules/ppc64/xfs-modules
new file mode 100644
index 000000000..c020b5d39
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64/xfs-modules
@@ -0,0 +1,2 @@
+#include <xfs-modules>
+
diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list
new file mode 100644
index 000000000..a5e76c764
--- /dev/null
+++ b/debian/installer/ppc64/package-list
@@ -0,0 +1,42 @@
+# This file is used to build up the control file. The kernel version and
+# "-di" are appended to the package names. Section can be left out. So can
+# architecture, which is derived from the files in the modules directory.
+# It overwrites specifications from /usr/share/kernel-wedge/package-list.
+#
+Package: ext2-modules
+Depends: kernel-image, core-modules
+
+Package: ext3-modules
+Depends: kernel-image, core-modules
+
+Package: ext4-modules
+Depends: kernel-image, core-modules
+
+Package: pata-modules
+Depends: kernel-image, ata-modules, core-modules
+
+Package: scsi-modules
+Depends: kernel-image, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
+
+Package: pcmcia-modules
+Depends: core-modules
+
+Package: nic-pcmcia-modules
+Depends: nic-modules, nic-wireless-modules, core-modules
+
+Package: hypervisor-modules
+Depends: kernel-image
+Priority: standard
+Description: IBM 64bit hypervisor console modules
+ Contains drivers for the hypervisor console, used as console for linux
+ running in logical partitions of IBM hardware supporting it.
+
+Package: fancontrol-modules
+Depends: kernel-image
+Priority: standard
+Description: Apple powermac fancontrol modules
+ Contains drivers for macintosh i2c bus as well as for the monitoring devices
+ connected to it. This allows to control the fans during installation.
+
+Package: nbd-modules
+Depends: kernel-image