diff --git a/debian/changelog b/debian/changelog
index cd1b43e11..cd006842e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ linux (3.8.13-2) UNRELEASED; urgency=low
 
   * udeb: Fix yet more configuration errors causing FTBFS:
     - [powerpcspe] Add llc to nic-shared-modules (Closes: #708662)
-    - [powerpc/powerpc64,ppc64] Replace ibmvscsic with ibmvscsi in scsi-modules
+    - [powerpc/powerpc64] Replace ibmvscsic with ibmvscsi in scsi-modules
+    - [ppc64] Use symlinks to follow powerpc/powerpc64 configuration
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 19 May 2013 00:26:48 +0100
 
diff --git a/debian/installer/ppc64/modules/ppc64 b/debian/installer/ppc64/modules/ppc64
new file mode 120000
index 000000000..f007b6a78
--- /dev/null
+++ b/debian/installer/ppc64/modules/ppc64
@@ -0,0 +1 @@
+../../powerpc/modules/powerpc-powerpc64
\ No newline at end of file
diff --git a/debian/installer/ppc64/modules/ppc64/affs-modules b/debian/installer/ppc64/modules/ppc64/affs-modules
deleted file mode 100644
index 3f0e4bb90..000000000
--- a/debian/installer/ppc64/modules/ppc64/affs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <affs-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/ata-modules b/debian/installer/ppc64/modules/ppc64/ata-modules
deleted file mode 100644
index be78de0c1..000000000
--- a/debian/installer/ppc64/modules/ppc64/ata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ata-modules>
-libata -
diff --git a/debian/installer/ppc64/modules/ppc64/btrfs-modules b/debian/installer/ppc64/modules/ppc64/btrfs-modules
deleted file mode 100644
index e261e1388..000000000
--- a/debian/installer/ppc64/modules/ppc64/btrfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <btrfs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/cdrom-core-modules b/debian/installer/ppc64/modules/ppc64/cdrom-core-modules
deleted file mode 100644
index e264d7aa3..000000000
--- a/debian/installer/ppc64/modules/ppc64/cdrom-core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <cdrom-core-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/core-modules b/debian/installer/ppc64/modules/ppc64/core-modules
deleted file mode 100644
index 73e336a32..000000000
--- a/debian/installer/ppc64/modules/ppc64/core-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <core-modules>
-bestcomm-core ?
diff --git a/debian/installer/ppc64/modules/ppc64/crc-modules b/debian/installer/ppc64/modules/ppc64/crc-modules
deleted file mode 100644
index 7e00de705..000000000
--- a/debian/installer/ppc64/modules/ppc64/crc-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crc-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/crypto-dm-modules b/debian/installer/ppc64/modules/ppc64/crypto-dm-modules
deleted file mode 100644
index 4c8f2354c..000000000
--- a/debian/installer/ppc64/modules/ppc64/crypto-dm-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-dm-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/crypto-modules b/debian/installer/ppc64/modules/ppc64/crypto-modules
deleted file mode 100644
index 3a1e862b4..000000000
--- a/debian/installer/ppc64/modules/ppc64/crypto-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <crypto-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/event-modules b/debian/installer/ppc64/modules/ppc64/event-modules
deleted file mode 100644
index f8819afd3..000000000
--- a/debian/installer/ppc64/modules/ppc64/event-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <event-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/ext2-modules b/debian/installer/ppc64/modules/ppc64/ext2-modules
deleted file mode 100644
index bbaebc8f1..000000000
--- a/debian/installer/ppc64/modules/ppc64/ext2-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ext2-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/ext3-modules b/debian/installer/ppc64/modules/ppc64/ext3-modules
deleted file mode 100644
index 55ef7d7bc..000000000
--- a/debian/installer/ppc64/modules/ppc64/ext3-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ext3-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/ext4-modules b/debian/installer/ppc64/modules/ppc64/ext4-modules
deleted file mode 100644
index 394c577ce..000000000
--- a/debian/installer/ppc64/modules/ppc64/ext4-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <ext4-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/fancontrol-modules b/debian/installer/ppc64/modules/ppc64/fancontrol-modules
deleted file mode 100644
index f069ca199..000000000
--- a/debian/installer/ppc64/modules/ppc64/fancontrol-modules
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index cce8fd30c..000000000
--- a/debian/installer/ppc64/modules/ppc64/fat-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <fat-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/firewire-core-modules b/debian/installer/ppc64/modules/ppc64/firewire-core-modules
deleted file mode 100644
index dcac80af9..000000000
--- a/debian/installer/ppc64/modules/ppc64/firewire-core-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <firewire-core-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/floppy-modules b/debian/installer/ppc64/modules/ppc64/floppy-modules
deleted file mode 100644
index 169fde52e..000000000
--- a/debian/installer/ppc64/modules/ppc64/floppy-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <floppy-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/fuse-modules b/debian/installer/ppc64/modules/ppc64/fuse-modules
deleted file mode 100644
index 0b6ba0c8c..000000000
--- a/debian/installer/ppc64/modules/ppc64/fuse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <fuse-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/hfs-modules b/debian/installer/ppc64/modules/ppc64/hfs-modules
deleted file mode 100644
index 57d12f649..000000000
--- a/debian/installer/ppc64/modules/ppc64/hfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <hfs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/hypervisor-modules b/debian/installer/ppc64/modules/ppc64/hypervisor-modules
deleted file mode 100644
index 29ceb6154..000000000
--- a/debian/installer/ppc64/modules/ppc64/hypervisor-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-hvcserver
-hvcs
diff --git a/debian/installer/ppc64/modules/ppc64/input-modules b/debian/installer/ppc64/modules/ppc64/input-modules
deleted file mode 100644
index 51e37ced9..000000000
--- a/debian/installer/ppc64/modules/ppc64/input-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <input-modules>
-atkbd
-i8042
diff --git a/debian/installer/ppc64/modules/ppc64/irda-modules b/debian/installer/ppc64/modules/ppc64/irda-modules
deleted file mode 100644
index b141b585b..000000000
--- a/debian/installer/ppc64/modules/ppc64/irda-modules
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index da4fa9a3c..000000000
--- a/debian/installer/ppc64/modules/ppc64/isofs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <isofs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/jfs-modules b/debian/installer/ppc64/modules/ppc64/jfs-modules
deleted file mode 100644
index 925a43a9e..000000000
--- a/debian/installer/ppc64/modules/ppc64/jfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <jfs-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/kernel-image b/debian/installer/ppc64/modules/ppc64/kernel-image
deleted file mode 100644
index 1bb8bf6d7..000000000
--- a/debian/installer/ppc64/modules/ppc64/kernel-image
+++ /dev/null
@@ -1 +0,0 @@
-# empty
diff --git a/debian/installer/ppc64/modules/ppc64/loop-modules b/debian/installer/ppc64/modules/ppc64/loop-modules
deleted file mode 100644
index 164467713..000000000
--- a/debian/installer/ppc64/modules/ppc64/loop-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <loop-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/md-modules b/debian/installer/ppc64/modules/ppc64/md-modules
deleted file mode 100644
index ade088ddb..000000000
--- a/debian/installer/ppc64/modules/ppc64/md-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <md-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/mouse-modules b/debian/installer/ppc64/modules/ppc64/mouse-modules
deleted file mode 100644
index 15fcb00ea..000000000
--- a/debian/installer/ppc64/modules/ppc64/mouse-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <mouse-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/multipath-modules b/debian/installer/ppc64/modules/ppc64/multipath-modules
deleted file mode 100644
index a8b69b253..000000000
--- a/debian/installer/ppc64/modules/ppc64/multipath-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <multipath-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/nbd-modules b/debian/installer/ppc64/modules/ppc64/nbd-modules
deleted file mode 100644
index 3c9b3e5d4..000000000
--- a/debian/installer/ppc64/modules/ppc64/nbd-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nbd-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/nic-extra-modules b/debian/installer/ppc64/modules/ppc64/nic-extra-modules
deleted file mode 100644
index 2a8a5ca5d..000000000
--- a/debian/installer/ppc64/modules/ppc64/nic-extra-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <nic-extra-modules>
-ehea
-ps3_gelic
diff --git a/debian/installer/ppc64/modules/ppc64/nic-modules b/debian/installer/ppc64/modules/ppc64/nic-modules
deleted file mode 100644
index a7d0d0b36..000000000
--- a/debian/installer/ppc64/modules/ppc64/nic-modules
+++ /dev/null
@@ -1,11 +0,0 @@
-#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
deleted file mode 100644
index 7a0702cd5..000000000
--- a/debian/installer/ppc64/modules/ppc64/nic-pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nic-pcmcia-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/nic-shared-modules b/debian/installer/ppc64/modules/ppc64/nic-shared-modules
deleted file mode 100644
index cc84b14dc..000000000
--- a/debian/installer/ppc64/modules/ppc64/nic-shared-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <nic-shared-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/pata-modules b/debian/installer/ppc64/modules/ppc64/pata-modules
deleted file mode 100644
index 4c7d4296b..000000000
--- a/debian/installer/ppc64/modules/ppc64/pata-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#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
deleted file mode 100644
index 2bb5350fe..000000000
--- a/debian/installer/ppc64/modules/ppc64/pcmcia-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <pcmcia-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/pcmcia-storage-modules b/debian/installer/ppc64/modules/ppc64/pcmcia-storage-modules
deleted file mode 100644
index 9fbaff306..000000000
--- a/debian/installer/ppc64/modules/ppc64/pcmcia-storage-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <pcmcia-storage-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/ppp-modules b/debian/installer/ppc64/modules/ppc64/ppp-modules
deleted file mode 100644
index f1ae9b3d1..000000000
--- a/debian/installer/ppc64/modules/ppc64/ppp-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ppp-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/reiserfs-modules b/debian/installer/ppc64/modules/ppc64/reiserfs-modules
deleted file mode 100644
index 372669677..000000000
--- a/debian/installer/ppc64/modules/ppc64/reiserfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <reiserfs-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/sata-modules b/debian/installer/ppc64/modules/ppc64/sata-modules
deleted file mode 100644
index 071cb860b..000000000
--- a/debian/installer/ppc64/modules/ppc64/sata-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <sata-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-common-modules b/debian/installer/ppc64/modules/ppc64/scsi-common-modules
deleted file mode 100644
index 49739018c..000000000
--- a/debian/installer/ppc64/modules/ppc64/scsi-common-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <scsi-common-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-core-modules b/debian/installer/ppc64/modules/ppc64/scsi-core-modules
deleted file mode 100644
index 6ec85bb77..000000000
--- a/debian/installer/ppc64/modules/ppc64/scsi-core-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#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
deleted file mode 100644
index f37aaaa3d..000000000
--- a/debian/installer/ppc64/modules/ppc64/scsi-extra-modules
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <scsi-extra-modules>
-
-ps3disk ?
diff --git a/debian/installer/ppc64/modules/ppc64/scsi-modules b/debian/installer/ppc64/modules/ppc64/scsi-modules
deleted file mode 100644
index da80e9026..000000000
--- a/debian/installer/ppc64/modules/ppc64/scsi-modules
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <scsi-modules>
-
-ibmvscsi
-ps3rom
diff --git a/debian/installer/ppc64/modules/ppc64/serial-modules b/debian/installer/ppc64/modules/ppc64/serial-modules
deleted file mode 100644
index 6ab8b8c35..000000000
--- a/debian/installer/ppc64/modules/ppc64/serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <serial-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/squashfs-modules b/debian/installer/ppc64/modules/ppc64/squashfs-modules
deleted file mode 100644
index 42d77887a..000000000
--- a/debian/installer/ppc64/modules/ppc64/squashfs-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <squashfs-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/udf-modules b/debian/installer/ppc64/modules/ppc64/udf-modules
deleted file mode 100644
index b90d7ee9b..000000000
--- a/debian/installer/ppc64/modules/ppc64/udf-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <udf-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/ufs-modules b/debian/installer/ppc64/modules/ppc64/ufs-modules
deleted file mode 100644
index 69745cad0..000000000
--- a/debian/installer/ppc64/modules/ppc64/ufs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <ufs-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/uinput-modules b/debian/installer/ppc64/modules/ppc64/uinput-modules
deleted file mode 100644
index 58a833779..000000000
--- a/debian/installer/ppc64/modules/ppc64/uinput-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <uinput-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/usb-modules b/debian/installer/ppc64/modules/ppc64/usb-modules
deleted file mode 100644
index c598dedd8..000000000
--- a/debian/installer/ppc64/modules/ppc64/usb-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <usb-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/usb-serial-modules b/debian/installer/ppc64/modules/ppc64/usb-serial-modules
deleted file mode 100644
index c0a0dc3bd..000000000
--- a/debian/installer/ppc64/modules/ppc64/usb-serial-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <usb-serial-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/usb-storage-modules b/debian/installer/ppc64/modules/ppc64/usb-storage-modules
deleted file mode 100644
index 272d95e2e..000000000
--- a/debian/installer/ppc64/modules/ppc64/usb-storage-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <usb-storage-modules>
-
diff --git a/debian/installer/ppc64/modules/ppc64/virtio-modules b/debian/installer/ppc64/modules/ppc64/virtio-modules
deleted file mode 100644
index 61da39659..000000000
--- a/debian/installer/ppc64/modules/ppc64/virtio-modules
+++ /dev/null
@@ -1 +0,0 @@
-#include <virtio-modules>
diff --git a/debian/installer/ppc64/modules/ppc64/xfs-modules b/debian/installer/ppc64/modules/ppc64/xfs-modules
deleted file mode 100644
index c020b5d39..000000000
--- a/debian/installer/ppc64/modules/ppc64/xfs-modules
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <xfs-modules>
-
diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list
deleted file mode 100644
index b2d4246b2..000000000
--- a/debian/installer/ppc64/package-list
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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: 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, ata-modules
-
-Package: pcmcia-modules
-Depends: kernel-image, core-modules
-
-Package: nic-pcmcia-modules
-Depends: kernel-image, nic-modules, nic-shared-modules, nic-wireless-modules, pcmcia-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
diff --git a/debian/installer/ppc64/package-list b/debian/installer/ppc64/package-list
new file mode 120000
index 000000000..d57167602
--- /dev/null
+++ b/debian/installer/ppc64/package-list
@@ -0,0 +1 @@
+../powerpc/package-list
\ No newline at end of file