diff --git a/ChangeLog b/ChangeLog
index a9ee4c4fabd5baa51e5aa84c98c18a3b47957168..5a17061bfd8413465074c8d7cf970b8815413861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-08  Niels M�ller  <nisse@lysator.liu.se>
+
+	* configure.ac (asm_path): Set up asm_path for x86_64.
+
+	* x86_64/machine.m4: New file, new directory.
+
 2008-08-28  Niels M�ller  <nisse@lysator.liu.se>
 
 	* examples/eratosthenes.c (main): Rewrote block-wise sieving to
diff --git a/configure.ac b/configure.ac
index c47a81fce9224318c00eb8b5b98cf31e3573ad03..99ad9f962ffbfa1ac70d3b36932cc4d7e37595d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,9 @@ case "$host_cpu" in
   [i?86* | k[5-8]* | pentium* | athlon])
     asm_path=x86
     ;;
+  [x86_64 | amd64])
+    asm_path=x86_64
+    ;;
   *sparc*)
     AC_TRY_COMPILE([
 #if defined(__sparcv9) || defined(__arch64__)