diff --git a/debian/changelog b/debian/changelog
index e6908a8c8..edd57959d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,10 @@ linux-2.6 (2.6.32-2) UNRELEASED; urgency=low
     (Closes: #560263)
   * atl1c: Fix system hang when link drops (Closes: #559577)
 
- -- Bastian Blank <waldi@debian.org>  Sun, 06 Dec 2009 20:42:14 +0100
+  [ Aurelien Jarno ]
+  * Add support for the sparc64 architecture.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 13 Dec 2009 13:25:45 +0100
 
 linux-2.6 (2.6.32-1) unstable; urgency=low
 
diff --git a/debian/config/defines b/debian/config/defines
index 1eb0c0888..7cd90fe17 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -15,6 +15,7 @@ arches:
  powerpc
  s390
  sparc
+ sparc64
 compiler: gcc-4.3
 featuresets:
  none
diff --git a/debian/config/sparc64/defines b/debian/config/sparc64/defines
new file mode 100644
index 000000000..b026ff548
--- /dev/null
+++ b/debian/config/sparc64/defines
@@ -0,0 +1,23 @@
+[base]
+featuresets:
+ vserver
+flavours:
+ sparc64
+ sparc64-smp
+kernel-arch: sparc
+
+[image]
+configs: sparc/config
+suggests: silo, fdutils
+
+[sparc64_description]
+hardware: uniprocessor 64-bit UltraSPARC
+
+[sparc64_image]
+configs: sparc/config.sparc64
+
+[sparc64-smp_description]
+hardware: multiprocessor 64-bit UltraSPARC
+
+[sparc64-smp_image]
+configs: sparc/config.sparc64-smp
diff --git a/debian/config/sparc64/vserver/defines b/debian/config/sparc64/vserver/defines
new file mode 100644
index 000000000..73d1036a1
--- /dev/null
+++ b/debian/config/sparc64/vserver/defines
@@ -0,0 +1,6 @@
+[base]
+flavours:
+ sparc64
+
+[image]
+recommends: util-vserver
diff --git a/debian/rules.real b/debian/rules.real
index 994f83ebd..2e905b74f 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -329,7 +329,8 @@ endif
 
 install-image_arm_$(FEATURESET)_$(FLAVOUR)_plain_image \
 install-image_armel_$(FEATURESET)_$(FLAVOUR)_plain_image \
-install-image_sparc_$(FEATURESET)_$(FLAVOUR)_plain_image:
+install-image_sparc_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_sparc64_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/arch/$(KERNEL_ARCH)/boot/zImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
 install-image_amd64_$(FEATURESET)_$(FLAVOUR)_plain_image \