diff --git a/CHANGES b/CHANGES
index 57c9a0162aa0e7be4595f80cd7a345f6c18eb467..9074769594398729f20bcd259cf060235ec950bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Remove C++ style comments from crypto/bn/bn_local.h.
+     [Neil Costigan <neil.costigan@celocom.com>]
+
   *) The function OBJ_txt2nid was broken. It was supposed to return a nid
      based on a text string, looking up short and long names and finally
      "dot" format. The "dot" format stuff didn't work. Added new function
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index 70b0787d8f5b08145b48400135a376d06d0fb828..889994364689500e69e3d36978bdba55faa2896d 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -67,11 +67,11 @@ extern "C" {
 
 /* Pentium pro 16,16,16,32,64 */
 /* Alpha       16,16,16,16.64 */
-#define BN_MULL_SIZE_NORMAL			(16) // 32
-#define BN_MUL_RECURSIVE_SIZE_NORMAL		(16) // 32 /* less than */
-#define BN_SQR_RECURSIVE_SIZE_NORMAL		(16) // 32
-#define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL	(32) // 32
-#define BN_MONT_CTX_SET_SIZE_WORD		(64) // 32
+#define BN_MULL_SIZE_NORMAL			(16) /* 32 */
+#define BN_MUL_RECURSIVE_SIZE_NORMAL		(16) /* 32 less than */
+#define BN_SQR_RECURSIVE_SIZE_NORMAL		(16) /* 32 */
+#define BN_MUL_LOW_RECURSIVE_SIZE_NORMAL	(32) /* 32 */
+#define BN_MONT_CTX_SET_SIZE_WORD		(64) /* 32 */
 
 #ifndef BN_MUL_COMBA
 #define bn_mul_comba8(r,a,b)	bn_mul_normal(r,a,8,b,8)