diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index 1e1e12d36d..e472e05069 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -14,6 +14,11 @@
 #ifndef CATALOG_H
 #define CATALOG_H
 
+/*
+ *	'pgrminclude ignore' needed here because CppAsString2() does not throw
+ *	an error if the symbol is not defined.
+ */
+#include "catalog/catversion.h"	/* pgrminclude ignore */
 #include "catalog/pg_class.h"
 #include "storage/relfilenode.h"
 #include "utils/relcache.h"
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index f5c9797c60..f3c8bb4142 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	201108051
+#define CATALOG_VERSION_NO	201109071
 
 #endif