diff --git a/mbuni/configure.ac b/mbuni/configure.ac
index 1b49330..9fb8420 100644
--- a/mbuni/configure.ac
+++ b/mbuni/configure.ac
@@ -25,7 +25,7 @@ AC_MSG_RESULT([$M_VERSION])
 AC_CONFIG_SRCDIR([mmlib/mms_util.c])
 AC_CONFIG_AUX_DIR(autotools)
 AM_INIT_AUTOMAKE([mbuni],[cvs])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([mbuni-config.h])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
diff --git a/mbuni/mmlib/mms_cfg.h b/mbuni/mmlib/mms_cfg.h
index 8654e8c..96346e8 100644
--- a/mbuni/mmlib/mms_cfg.h
+++ b/mbuni/mmlib/mms_cfg.h
@@ -16,7 +16,7 @@
 #include "gwlib/gwlib.h"
 #include "gwlib/mime.h"
 
-#include "config.h"
+#include "mbuni-config.h"
 
 typedef struct mCfg mCfg; /* config file structure. */
 typedef struct mCfgGrp mCfgGrp; /* A config group. */
diff --git a/mbuni/mmlib/mms_util.h b/mbuni/mmlib/mms_util.h
index c919ece..b1297f8 100644
--- a/mbuni/mmlib/mms_util.h
+++ b/mbuni/mmlib/mms_util.h
@@ -16,7 +16,7 @@
 #include "gwlib/gwlib.h"
 #include "gwlib/mime.h"
 
-#include "config.h"
+#include "mbuni-config.h"
 #include "mms_strings.h"
 #include "mms_msg.h"
 #include "mms_mm7soap.h"