diff --git a/ChangeLog b/ChangeLog
index 06840be86..1b69b59db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-05  Werner Lemberg  <wl@gnu.org>
+
+	Fix compilation with C++.
+
+	* src/base/md5.c (body): Use proper cast.
+
 2013-05-05  Werner Lemberg  <wl@gnu.org>
 
 	Fix 64bit compilation issues.
diff --git a/src/base/md5.c b/src/base/md5.c
index 7d43a603a..2f01c9302 100644
--- a/src/base/md5.c
+++ b/src/base/md5.c
@@ -95,7 +95,7 @@ static void *body(MD5_CTX *ctx, void *data, unsigned long size)
 	MD5_u32plus a, b, c, d;
 	MD5_u32plus saved_a, saved_b, saved_c, saved_d;
 
-	ptr = data;
+	ptr = (unsigned char *)data;
 
 	a = ctx->a;
 	b = ctx->b;