diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 716747daa..d46ea5149 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* uname.cc (uname): Change "amd64" to "x86_64" as on Linux.
+
 2005-06-06  Corinna Vinschen  <corinna@vinschen.de>
 
 	* uname.cc (uname): Add missing break.
diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index 104c616b4..daad40922 100644
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -82,7 +82,7 @@ uname (struct utsname *name)
 	strcpy (name->machine, "ia64");
 	break;
       case PROCESSOR_ARCHITECTURE_AMD64:
-	strcpy (name->machine, "amd64");
+	strcpy (name->machine, "x86_64");
 	break;
       case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
 	strcpy (name->machine, "ia32-win64");