diff --git a/ChangeLog b/ChangeLog
index 7dff0cfae..3ca702d64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,7 @@ Bugfix
    * Fix possible miscomputation of the premaster secret with DHE-PSK key
      exchange that caused some handshakes to fail with other implementations.
      (Failure rate <= 1/255 with common DHM moduli.)
+   * Disable broken Sparc64 bn_mul assembly (found by Florian Obser).
 
 = PolarSSL 1.3.7 released on 2014-05-02
 Features
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 0e9385bef..64b59ff1e 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(                                                \