diff --git a/ChangeLog b/ChangeLog
index 351166b56..4763eb3f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-02 Paulo Andrade <pcpa@gnu.org>
+
+	* include/lightning/jit_mips.h: Add proper mips abi detection.
+
 2013-10-30 Paulo Andrade <pcpa@gnu.org>
 
 	* lib/jit_print.c: Do not crash if calling jit_print from
diff --git a/include/lightning/jit_mips.h b/include/lightning/jit_mips.h
index a936f3642..855e33d0b 100644
--- a/include/lightning/jit_mips.h
+++ b/include/lightning/jit_mips.h
@@ -23,8 +23,11 @@
 #define JIT_HASH_CONSTS		1
 #define JIT_NUM_OPERANDS	3
 
-#if defined(_ABIN32)
-#  define NEW_ABI		1
+#if _MIPS_SIM == _ABIN32
+#    define NEW_ABI		1
+#elif _MIPS_SIM != _ABIO32
+/* FIXME port to _ABI64 */
+#  error "Unsupported ABI"
 #endif
 
 /*