diff --git a/ChangeLog b/ChangeLog
index e5c27da2..57dd87df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-12-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	* modules/im/ximcp/Makefile.am:
+	Add check and cflags for malloc(0) returning NULL.
+	* modules/lc/Utf8/Makefile.am:
+	* modules/om/generic/Makefile.am:
+	* src/Makefile.am:
+	* src/xcms/Makefile.am:
+	* src/xkb/Makefile.am:
+	* src/xlibi18n/Makefile.am:
+
 2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* x11.pc.in:
diff --git a/configure.ac b/configure.ac
index 74bf7255..ace5098d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,6 +327,7 @@ AC_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
 AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
 AC_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
 
+XORG_CHECK_MALLOC_ZERO
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([Makefile
diff --git a/modules/im/ximcp/Makefile.am b/modules/im/ximcp/Makefile.am
index b0bfc39d..3166396b 100644
--- a/modules/im/ximcp/Makefile.am
+++ b/modules/im/ximcp/Makefile.am
@@ -10,7 +10,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT
+	-D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT \
+	$(MALLOC_ZERO_CFLAGS)
 
 if XLIB_LOADABLE_I18N
 
diff --git a/modules/lc/Utf8/Makefile.am b/modules/lc/Utf8/Makefile.am
index 4a7296e3..0dddc45e 100644
--- a/modules/lc/Utf8/Makefile.am
+++ b/modules/lc/Utf8/Makefile.am
@@ -10,7 +10,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE \
+	$(MALLOC_ZERO_CFLAGS)
 
 if XLIB_LOADABLE_I18N
 
diff --git a/modules/om/generic/Makefile.am b/modules/om/generic/Makefile.am
index ea5e77de..23caa0c7 100644
--- a/modules/om/generic/Makefile.am
+++ b/modules/om/generic/Makefile.am
@@ -11,7 +11,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE \
+	$(MALLOC_ZERO_CFLAGS)
 
 if XLIB_LOADABLE_I18N
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a040b88..a155df13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT
+	-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT \
+	$(XMALLOC_ZERO_CFLAGS)
 
 #
 # =============================== I18N =============================
diff --git a/src/xcms/Makefile.am b/src/xcms/Makefile.am
index 4b534e48..3300aba9 100644
--- a/src/xcms/Makefile.am
+++ b/src/xcms/Makefile.am
@@ -13,7 +13,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE \
+	$(XMALLOC_ZERO_CFLAGS)
 
 libxcms_la_SOURCES = \
 		  AddDIC.c \
diff --git a/src/xkb/Makefile.am b/src/xkb/Makefile.am
index b544914c..c33b80e1 100644
--- a/src/xkb/Makefile.am
+++ b/src/xkb/Makefile.am
@@ -10,7 +10,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE \
+	$(XMALLOC_ZERO_CFLAGS)
 
 noinst_LTLIBRARIES = libxkb.la
 
diff --git a/src/xlibi18n/Makefile.am b/src/xlibi18n/Makefile.am
index 7abb8ef6..28b9f1a5 100644
--- a/src/xlibi18n/Makefile.am
+++ b/src/xlibi18n/Makefile.am
@@ -11,7 +11,8 @@ AM_CFLAGS= \
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE \
+	$(XMALLOC_ZERO_CFLAGS)
 
 noinst_LTLIBRARIES = libi18n.la