diff --git a/Bundler/molly-guard.xml b/Bundler/molly-guard.xml
index 3fcbe65..36d4445 100644
--- a/Bundler/molly-guard.xml
+++ b/Bundler/molly-guard.xml
@@ -1,3 +1,4 @@
 <Bundle name="molly-guard">
   <Package name="molly-guard"/>
+  <ConfigFile name="/etc/molly-guard/rc"/>
 </Bundle>
diff --git a/Cfg/etc/molly-guard/rc/rc b/Cfg/etc/molly-guard/rc/rc
new file mode 100644
index 0000000..6444cb7
--- /dev/null
+++ b/Cfg/etc/molly-guard/rc/rc
@@ -0,0 +1,8 @@
+# Generated by Bcfg2, do NOT edit by hand
+# 
+# molly-guard settings
+#
+# ALWAYS_QUERY_HOSTNAME
+# when set, causes the 30-query-hostname script to always ask for the
+# hostname, even if no SSH session was detected.
+ALWAYS_QUERY_HOSTNAME=true