diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 456d1cd190f..ac616d69aa2 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-04  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR libitm/52854
+	* config/x86/target.h (gtm_jmpbuf): Replace long with long long
+	for x86-64.
+
 2012-04-03  Tristan Gingold  <gingold@adacore.com>
 
 	* configure: Regenerate.
diff --git a/libitm/config/x86/target.h b/libitm/config/x86/target.h
index 1d81a4777f3..5c7e6fbee88 100644
--- a/libitm/config/x86/target.h
+++ b/libitm/config/x86/target.h
@@ -29,13 +29,13 @@ namespace GTM HIDDEN {
 typedef struct gtm_jmpbuf
 {
   void *cfa;
-  unsigned long rbx;
-  unsigned long rbp;
-  unsigned long r12;
-  unsigned long r13;
-  unsigned long r14;
-  unsigned long r15;
-  unsigned long rip;
+  unsigned long long rbx;
+  unsigned long long rbp;
+  unsigned long long r12;
+  unsigned long long r13;
+  unsigned long long r14;
+  unsigned long long r15;
+  unsigned long long rip;
 } gtm_jmpbuf;
 #else
 typedef struct gtm_jmpbuf