diff --git a/src/ChangeLog b/src/ChangeLog
index fc10c1e0e..6dc6acb00 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug  9 22:39:12 1998  Janne Kukonlehto  <jtklehto@paju.oulu.fi>
+
+	* mad.h (calloc): Added parentheses around the arguments as
+ 	suggested by Steef Boerrigter <sxmboer@sci.kun.nl>.
+
 Fri Jul 31 09:04:35 1998  Pavel Roskin <pavel.roskin@escoft.co.uk>
 
 	* syntax.c: makefile* will be highlighted as Makefile*
diff --git a/src/mad.h b/src/mad.h
index 0119e1c74..a7201e4eb 100644
--- a/src/mad.h
+++ b/src/mad.h
@@ -23,7 +23,7 @@
 #endif
 
 #define malloc(x)	mad_alloc (x, __FILE__, __LINE__)
-#define calloc(x, y)	mad_alloc (x * y, __FILE__, __LINE__)
+#define calloc(x, y)	mad_alloc ((x) * (y), __FILE__, __LINE__)
 #define realloc(x, y)	mad_realloc (x, y, __FILE__, __LINE__)
 #define xmalloc(x, y)	mad_alloc (x, __FILE__, __LINE__)
 #define strdup(x)	mad_strdup (x, __FILE__, __LINE__)