4 files changed, 10 insertions, 3 deletions
diff --git a/build/arch-options/arm b/build/arch-options/armel
index 29864a58c..f430c2cc4 100644
--- a/build/arch-options/arm
+++ b/build/arch-options/armel
@@ -1,7 +1,11 @@
 # This file contains architecture specific variables for
-# the 'arm' architecture
+# the 'armel' architecture
 # It is sourced by the build scripts
 
+# Note that we keep "arm" as archspec (and thus also for conditions)
+# and also continue to use "arm" for arch-specific XML-files in order
+# to minimize impact on translations.
+
 archspec="arm;not-x86;not-s390;not-m68k;not-powerpc;not-alpha"
 arch_listname="arm"
 minimum_memory=32
diff --git a/debian/archlist b/debian/archlist
index 8e8b4ba77..b321edbc6 100644
--- a/debian/archlist
+++ b/debian/archlist
@@ -6,7 +6,7 @@
 i386	Intel x86
 alpha	Alpha
 amd64	AMD64
-arm	ARM
+armel	ARM
 hppa	PA-RISC (hppa)
 ia64	IA-64
 #m68k	Motorola 680x0
diff --git a/debian/changelog b/debian/changelog
index d2e97b42e..77c5c4c9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 installation-guide (2009xxxx) UNRELEASED; urgency=low
 
   * Switch over from Lenny to Squeeze. Current kernel is 2.6.29.
+  * Change the Debian designation for the ARM architecture from arm to armel.
+    The internal 'arch-spec' and file naming convention remains "arm" in order
+    to avoid unnecessary changes and work for translators.
 
  -- Frans Pop <fjp@debian.org>  Mon, 27 Apr 2009 23:49:42 +0200
 
diff --git a/debian/control b/debian/control
index c9183f6eb..08e82894e 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,7 @@ Description: Debian installation guide
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
-Package: installation-guide-arm
+Package: installation-guide-armel
 Architecture: all
 Conflicts: installation-guide
 Description: Debian installation guide