diff --git a/src/modules/Postgres/acconfig.h b/src/modules/Postgres/acconfig.h
index 360942d73739d43d02434e98d367588f238d25af..c1be15b221f28e88a2482a55c5277b80071cedb5 100644
--- a/src/modules/Postgres/acconfig.h
+++ b/src/modules/Postgres/acconfig.h
@@ -2,7 +2,7 @@
 || This file is part of Pike. For copyright information see COPYRIGHT.
 || Pike is distributed under GPL, LGPL and MPL. See the file COPYING
 || for more information.
-|| $Id: acconfig.h,v 1.12 2008/03/13 15:10:06 grubba Exp $
+|| $Id: acconfig.h,v 1.13 2008/07/04 20:11:00 srb Exp $
 */
 
 #ifndef PIKE_POSTGRES_H
@@ -61,6 +61,7 @@
 /* postgres_fe.h should be used in preference to postgres.h in
  * client code.
  */
+#include "override.h"
 #ifdef HAVE_POSTGRESQL_SERVER_POSTGRES_FE_H
 #include <server/postgres_fe.h>
 #elif defined(HAVE_SERVER_POSTGRES_FE_H)
diff --git a/src/modules/Postgres/override.h b/src/modules/Postgres/override.h
new file mode 100644
index 0000000000000000000000000000000000000000..5178c57dffd2b13c39ba524c24ed8ed31bb2cb87
--- /dev/null
+++ b/src/modules/Postgres/override.h
@@ -0,0 +1,9 @@
+/* These are defined inside the Postgres library headers as well.
+ * We don't want the redefine-warnings.
+ */
+
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION