diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index 7c3961e5e..7794ef25b 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -148,7 +148,7 @@ typedef uint32_t t_udbl;
           defined(__ppc64__) || defined(__powerpc64__) || \
           defined(__ia64__)  || defined(__alpha__)     || \
           (defined(__sparc__) && defined(__arch64__))  || \
-          defined(__s390x__) ) )
+          defined(__s390x__) || defined(__mips64) ) )
        #define POLARSSL_HAVE_INT64
        typedef  int64_t t_sint;
        typedef uint64_t t_uint;
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index f7199ef97..0179b9797 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -680,7 +680,7 @@
     );
 #endif /* Alpha */
 
-#if defined(__mips__) && !defined(__mips64__)
+#if defined(__mips__) && !defined(__mips64)
 
 #define MULADDC_INIT                    \
     asm(                                \