diff --git a/emacs-sparc.diff b/emacs-sparc.diff
new file mode 100644
index 0000000..426ba23
--- /dev/null
+++ b/emacs-sparc.diff
@@ -0,0 +1,17 @@
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: emacs-23.1/configure.in
+===================================================================
+--- emacs-23.1.orig/configure.in
++++ emacs-23.1/configure.in
+@@ -443,7 +443,7 @@ dnl see the `changequote' comment above.
+   ;;
+ 
+   ## Suns
+-  sparc-*-linux* | sparc64-*-linux* )
++  sparc*-*-linux* )
+     machine=sparc opsys=gnu-linux
+   ;;
+ 
diff --git a/emacs.changes b/emacs.changes
index 6f945f6..bfbb3ba 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 18 13:33:01 CET 2009 - jengelh@medozas.de
+
+- Make ./configure --target=sparcv9-suse-linux work (as a result of
+  rpmbuild --target=sparcv9)
+
 -------------------------------------------------------------------
 Tue Dec  1 15:18:04 CET 2009 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 637e2fd..a0ed703 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package emacs (Version 23.1)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@ Url:            http://www.gnu.org/software/emacs/
 License:        GPLv2+
 Group:          Productivity/Editors/Emacs
 Version:        23.1
-Release:        5
+Release:        6
 Obsoletes:      ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
@@ -56,6 +56,7 @@ Patch14:        emacs-23.1-bnc556175.patch
 Patch15:        emacs-22.2-iconic.patch
 Patch16:        emacs-23.1-flyspell.patch
 Patch17:        emacs-23.1-bnc558884.patch
+Patch18:        emacs-sparc.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global bug_345669  0
 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)}
@@ -240,6 +241,7 @@ Authors:
 if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
     install-mh -auto < /dev/null
 fi
+%patch -P 18 -p1
 
 %build
 cflags ()