diff --git a/debian/arch/ia64/config.itanium b/debian/arch/ia64/config.itanium
deleted file mode 100644
index 715800ed9..000000000
--- a/debian/arch/ia64/config.itanium
+++ /dev/null
@@ -1,12 +0,0 @@
-CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_ITANIUM=y
-# CONFIG_MCKINLEY is not set
-CONFIG_IA64_BRL_EMU=y
-CONFIG_IA64_L1_CACHE_SHIFT=6
-CONFIG_SMP=y
-CONFIG_NR_CPUS=64
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_SCHED_SMT is not set
-CONFIG_HAVE_DEC_LOCK=y
diff --git a/debian/arch/ia64/config.mckinley b/debian/arch/ia64/config.mckinley
deleted file mode 100644
index 2e657e4c3..000000000
--- a/debian/arch/ia64/config.mckinley
+++ /dev/null
@@ -1,11 +0,0 @@
-CONFIG_LOCK_KERNEL=y
-# CONFIG_CPUSETS is not set
-CONFIG_STOP_MACHINE=y
-# CONFIG_ITANIUM is not set
-CONFIG_MCKINLEY=y
-CONFIG_IA64_L1_CACHE_SHIFT=7
-CONFIG_SMP=y
-CONFIG_NR_CPUS=64
-# CONFIG_HOTPLUG_CPU is not set
-# CONFIG_SCHED_SMT is not set
-CONFIG_HAVE_DEC_LOCK=y
diff --git a/debian/arch/ia64/defines b/debian/arch/ia64/defines
index 99cddf867..5cdf987c5 100644
--- a/debian/arch/ia64/defines
+++ b/debian/arch/ia64/defines
@@ -1,9 +1,7 @@
 [base]
 compiler: gcc-4.1
 flavours:
- itanium
  itanium-smp
- mckinley
  mckinley-smp
 kernel-arch: ia64
 kernel-header-dirs: ia64
@@ -11,15 +9,9 @@ kernel-header-dirs: ia64
 [image]
 suggests: elilo, fdutils
 
-[itanium]
-class: Itanium
-
 [itanium-smp]
 class: multi-processor Itanium
 
-[mckinley]
-class: Itanium II
-
 [mckinley-smp]
 class: multi-processor Itanium II
 
diff --git a/debian/changelog b/debian/changelog
index f9212d7f3..6858e95a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,7 +43,14 @@ linux-2.6 (2.6.17-3) UNRELEASED; urgency=low
   [ Sven Luther ]
   * Re-enabled fs-asfs patch.
 
- -- maximilian attems <maks@sternwelten.at>  Fri,  7 Jul 2006 15:23:43 +0200
+  [ dann frazier ]
+  * [ia64] Drop the non-SMP flavours; they are not well maintained upstream.
+    Note that the non-SMP flavours have been identical to the SMP builds
+    since 2.6.13-1; this was to avoid having to drop then re-add these
+    flavours if upstream resolved the issue - but that never happened.
+    Note that this is a measurable performance penalty on non-SMP systems.
+
+ -- dann frazier <dannf@debian.org>  Sat,  8 Jul 2006 21:31:04 -0600
 
 linux-2.6 (2.6.17-2) unstable; urgency=low