diff --git a/sm5/CHANGELOG b/sm5/CHANGELOG
index a6fff85b73ba4e37feaddb34e28f8fafa1141de7..6b60fd1e2a351f80f86a6b7f44ac882a2b2f5724 100644
--- a/sm5/CHANGELOG
+++ b/sm5/CHANGELOG
@@ -1,6 +1,6 @@
 CHANGELOG for smartmontools
 
-$Id: CHANGELOG,v 1.586 2006/10/30 08:58:55 geoffk1 Exp $
+$Id: CHANGELOG,v 1.587 2006/10/30 12:28:53 ballen4705 Exp $
 
 The most recent version of this file is:
 http://smartmontools.cvs.sourceforge.net/smartmontools/sm5/CHANGELOG?view=markup
@@ -33,6 +33,9 @@ NOTES FOR FUTURE RELEASES: see TODO file.
 
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [BA] Finished Christian's fix (next item below) by removing
+       LINUX_86_64 hack from configure.in.
+
   [CF] Fixed inclusion of PRI?64 macros from inttypes.h.
 
   [CF] Windows: Added WRITE LOG to support selective self tests.
diff --git a/sm5/configure.in b/sm5/configure.in
index d3d6f690448bdcc3487feb3112b5f9d4e3126278..447ce6da46e2330e3f0c0f62c7c82ab07e020172 100644
--- a/sm5/configure.in
+++ b/sm5/configure.in
@@ -1,5 +1,5 @@
 #
-# $Id: configure.in,v 1.120 2006/10/25 17:01:42 ballen4705 Exp $
+# $Id: configure.in,v 1.121 2006/10/30 12:28:54 ballen4705 Exp $
 #
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.50)
@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.37, smartmontools-support@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(smartctl.cpp)
 
 smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.120 2006/10/25 17:01:42 ballen4705 Exp $'`
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.121 2006/10/30 12:28:54 ballen4705 Exp $'`
 smartmontools_release_date=2006/04/12
 smartmontools_release_time="17:39:01 UTC"
 
@@ -129,10 +129,6 @@ AC_SUBST(smartmontools_release_time)
 
 dnl if OS not recognized, then use the os_generic modules
 case "${host}" in
-	x86_64-*-linux-gnu*) 
-		AC_DEFINE_UNQUOTED(LINUX_X86_64, 1, [this is an x86_64 Linux system])
-		AC_SUBST([os_deps], ['os_linux.o']) 
-		AC_SUBST([os_libs], ['']) ;;
 	*-*-linux-gnu*) 
 		AC_SUBST([os_deps], ['os_linux.o']) 
 		AC_SUBST([os_libs], ['']) ;;