diff --git a/CHANGES b/CHANGES
index 33e474abbdf9a03b164a890d5ae978f1eb7cd482..3f425a3b95181efb60245fb824fd4c8595c8eab0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.3a and 0.9.4
 
+  *) "linux-sparc64-gcc" configuration (ultrapenguin).
+     [Ray Miller <ray.miller@oucs.ox.ac.uk>]
+
   *) config now generates no-xxx options for missing ciphers.
      [Ulf Möller]
 
@@ -15,6 +18,7 @@
   *) Support BS2000/OSD-POSIX.
      [Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>]
 
+>>>>>>> 1.252
   *) Make callbacks for key generation use void * instead of char *.
      [Ben Laurie]
 
@@ -24,7 +28,7 @@
   *) Additional typesafe stacks.
      [Ben Laurie]
 
-  *) New configuration variant "bsdi-elf-gcc" (BSD/OS 4.x).
+  *) New configuration variants "bsdi-elf-gcc" (BSD/OS 4.x).
      [Bodo Moeller]
 
 
diff --git a/Configure b/Configure
index 19bef037fe1e6f4f2a97449d51b4f3be72e6adf0..78b032eaad3999910941797404ca86f3a723e121 100755
--- a/Configure
+++ b/Configure
@@ -172,6 +172,7 @@ my %table=(
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
 "linux-mips",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall:(unknown)::BN_LLONG:::",
 "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall:(unknown)::::",
+"linux-sparc64-gcc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mv8 -Wall:-D_REENTRANT:::::",
 "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN:(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN:(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
 "NetBSD-x86",	"gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall:(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
diff --git a/config b/config
index 534f3a46e09621fa9b354e3f86f9f71fb70de8f3..10528a83d9a0c5d03dcf14d70a496f1c778f2eed 100755
--- a/config
+++ b/config
@@ -313,6 +313,7 @@ case "$GUESSOS" in
   alpha-*-linux2) OUT="alpha-gcc" ;;
   ppc-*-linux2) OUT="linux-ppc" ;;
   mips-*-linux?) OUT="linux-mips" ;;
+  sparc64-*-linux2) OUT="linux-sparc64-$CC" ;;
   *-*-linux2) OUT="linux-elf" ;;
   *-*-linux1) OUT="linux-aout" ;;
   sun4u-sun-solaris2) OUT="solaris-usparc-$CC" ;;