diff --git a/ChangeLog b/ChangeLog
index e3ff2c6..5578982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-10  Miklos Szeredi <miklos@szeredi.hu>
+
+	* kernel: add necessary compile flags for 2.4.X/x86_64.
+	Report from Sean Ziegeler
+
 2006-01-09  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Released 2.5.0-pre2
diff --git a/kernel/configure.ac b/kernel/configure.ac
index a0c6bab..3748107 100644
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -110,6 +110,12 @@
 			KERNELCFLAGS="$CFLAGS"
 		fi
 		CFLAGS="$old_cflags"
+		AC_MSG_CHECKING([architecture])
+		arch=`/bin/ls -l ${kernelsrc}/include/asm | sed "s/.*-> asm-//"`
+		AC_MSG_RESULT([$arch])
+		if test "$arch" = x86_64; then
+			KERNELCFLAGS="$KERNELCFLAGS -mno-red-zone -mcmodel=kernel -fno-reorder-blocks -finline-limit=2000"
+		fi
 	else
 		fuse_configured=no
 		kernel_autoconf=$kernelbuild/include/linux/autoconf.h