diff --git a/ChangeLog b/ChangeLog
index 9bcf2992..97728b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@ brevity.  Much more detail can be found in the git revision history:
   - Don't bitshift by negative amounts when encoding/decoding run sizes in chunk
     header maps.  This affected systems with page sizes greater than 8 KiB.
   - Rename index_t to szind_t to avoid an existing type on Solaris.
+  - Add JEMALLOC_CXX_THROW to the memalign() function prototype, in order to
+    match glibc and avoid compilation errors when including both
+    jemalloc/jemalloc.h and malloc.h in C++ code.
 
 * 4.0.0 (August 17, 2015)
 
diff --git a/include/jemalloc/jemalloc_protos.h.in b/include/jemalloc/jemalloc_protos.h.in
index 317ffdb9..a78414b1 100644
--- a/include/jemalloc/jemalloc_protos.h.in
+++ b/include/jemalloc/jemalloc_protos.h.in
@@ -56,7 +56,7 @@ JEMALLOC_EXPORT size_t JEMALLOC_NOTHROW	@je_@malloc_usable_size(
 #ifdef JEMALLOC_OVERRIDE_MEMALIGN
 JEMALLOC_EXPORT JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN
     void JEMALLOC_NOTHROW	*@je_@memalign(size_t alignment, size_t size)
-    JEMALLOC_ATTR(malloc);
+    JEMALLOC_CXX_THROW JEMALLOC_ATTR(malloc);
 #endif
 
 #ifdef JEMALLOC_OVERRIDE_VALLOC