diff --git a/ChangeLog b/ChangeLog
index 08fbc52dc..03c7e31c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,7 @@ Bugfix
    * Fix preprocessor checks for bn_mul PPC asm (found by Barry K. Nathan).
    * Use \n\t rather than semicolons for bn_mul asm, since some assemblers
      interpret semicolons as comment delimiters (found by Barry K. Nathan).
+   * Disable broken Sparc64 bn_mul assembly (found by Florian Obser).
 
 = Version 1.2.10 released 2013-10-07
 Changes
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index bf5aac487..6ce6abc69 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -409,7 +409,11 @@
 
 #endif /* PPC32 */
 
-#if defined(__sparc__) && defined(__sparc64__)
+/*
+ * The Sparc64 assembly is reported to be broken.
+ * Disable it for now, until we're able to fix it.
+ */
+#if 0 && defined(__sparc__) && defined(__sparc64__)
 
 #define MULADDC_INIT                                    \
     asm(                                                \