diff --git a/bin/setup.conf.txt b/bin/setup.conf.txt
index b9c8762f47aa2318c7311a131ea06071206cc5ff..5b173c59be5815cf19bbffd083f948b4df30c5be 100644
--- a/bin/setup.conf.txt
+++ b/bin/setup.conf.txt
@@ -42,3 +42,9 @@ DBLOAD=
 # cumbersome during development. To speed it up,
 # list the desired locales.
 # export CIVICRM_LOCALES=en_US,fr_FR
+
+# GenCode produces some CMS-specific config files
+# If omitted, defaults to drupal.
+GENCODE_CMS=""
+# GENCODE_CMS=drupal
+# GENCODE_CMS=wordpress
diff --git a/bin/setup.sh b/bin/setup.sh
index bbf19adab1132ba534664d5c7cc2e8aa86d3be69..1d5435622e1d29069b3006dc18b7d40d4a3d9476 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -49,7 +49,7 @@ fi
 # checkout, not packaged code
 if [ -d "$CALLEDPATH/../xml" ]; then
   cd "$CALLEDPATH/../xml"
-  "$PHP5PATH"php GenCode.php $SCHEMA
+  "$PHP5PATH"php GenCode.php $SCHEMA '' $GENCODE_CMS
 fi
 
 # someone might want to use empty password for development,