diff --git a/ChangeLog b/ChangeLog
index 29cdc2818..7a74dd02a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	* lightning/i386/asm-i386.h: Cast memory address to long for JCCim.
+
 2008-03-15  Paolo Bonzini  <bonzini@gnu.org>
 
 	* lightning/asm-common.h: Add underscores around __unused__
diff --git a/lightning/i386/asm-i386.h b/lightning/i386/asm-i386.h
index 728ae3673..62f9ba098 100644
--- a/lightning/i386/asm-i386.h
+++ b/lightning/i386/asm-i386.h
@@ -942,8 +942,7 @@ enum {
 #define JGSm(D)				JCCSim(0xf, D)
 
 /*									_format		Opcd		,Mod ,r	    ,m		,mem=dsp+sib	,imm... */
-#define JCCii(CC, D)							_OO_L		(0x0f80|(CC)				,(int)(D)		)
-#define JCCim(CC, D)							_OO_D32		(0x0f80|(CC)				,(int)(D)		)
+#define JCCim(CC, D)							_OO_D32		(0x0f80|(CC)				,(long)(D)		)
 #define JOm(D)				JCCim(0x0, D)
 #define JNOm(D)				JCCim(0x1, D)
 #define JBm(D)				JCCim(0x2, D)