diff --git a/ChangeLog b/ChangeLog
index fdd821bb17..2cac91c727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 27 13:16:48 2011  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ns_spki.c: parenthesize macro arguments.
+
 Sat Feb 26 17:07:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date.rb: [Feature #4257]
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index b67dd225a1..fde8957206 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -11,14 +11,14 @@
 #include "ossl.h"
 
 #define WrapSPKI(klass, obj, spki) do { \
-    if (!spki) { \
+    if (!(spki)) { \
 	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
     } \
-    obj = Data_Wrap_Struct(klass, 0, NETSCAPE_SPKI_free, spki); \
+    (obj) = Data_Wrap_Struct((klass), 0, NETSCAPE_SPKI_free, (spki)); \
 } while (0)
 #define GetSPKI(obj, spki) do { \
-    Data_Get_Struct(obj, NETSCAPE_SPKI, spki); \
-    if (!spki) { \
+    Data_Get_Struct((obj), NETSCAPE_SPKI, (spki)); \
+    if (!(spki)) { \
 	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
     } \
 } while (0)