diff --git a/debian/changelog b/debian/changelog
index eb4b17d0f..ee6a6b068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+linux (3.12.6-3) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * [hppa] Update configuration, thanks to Helge Deller (Closes: #733895)
+    - Change AGP, AGP_PARISC from modules to built-in, to work around
+      race condition between DRM and AGP
+    - Enable DEBUG_STACKOVERFLOW
+    - udeb: Build packages for the parisc64-smp flavour instead of the
+      removed parisc flavour (fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Thu, 02 Jan 2014 01:26:59 +0000
+
 linux (3.12.6-2) unstable; urgency=medium
 
   [ Bastian Blank ]
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 733b78fca..4e2b56a6e 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -21,6 +21,7 @@ CONFIG_PARISC_PAGE_SIZE_4KB=y
 ## file: arch/parisc/Kconfig.debug
 ##
 # CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
 
 ##
 ## file: block/partitions/Kconfig
diff --git a/debian/config/hppa/config.parisc64-smp b/debian/config/hppa/config.parisc64-smp
index a1a6fbc18..d36d2bd39 100644
--- a/debian/config/hppa/config.parisc64-smp
+++ b/debian/config/hppa/config.parisc64-smp
@@ -19,8 +19,8 @@ CONFIG_PATA_SIL680=m
 ## file: drivers/char/agp/Kconfig
 ##
 #. for ATI FireGL DRM in C8000 workstation
-CONFIG_AGP=m
-CONFIG_AGP_PARISC=m
+CONFIG_AGP=y
+CONFIG_AGP_PARISC=y
 
 ##
 ## file: drivers/gpu/drm/Kconfig
diff --git a/debian/installer/hppa/kernel-versions b/debian/installer/hppa/kernel-versions
index 752281411..e59e12c0a 100644
--- a/debian/installer/hppa/kernel-versions
+++ b/debian/installer/hppa/kernel-versions
@@ -1,3 +1,3 @@
-# arch version flavour  installedname suffix build-depends
-hppa   -       parisc   -             y      -
-hppa   -       parisc64 -             y      -
+# arch version flavour      installedname suffix build-depends
+hppa   -       parisc       -             y      -
+hppa   -       parisc64-smp -             y      -