diff --git a/conf/master b/conf/master
index b61e5808e8c..898cf93f2ba 100644
--- a/conf/master
+++ b/conf/master
@@ -14,4 +14,8 @@
 #pki_dir: /etc/salt/pki
 # Directory to store job and cache data
 #cachedir: /var/cache/salt
-
+# Enable "open mode", this mode still maintains encryption, but turns off
+# authentication, this is only intended for highly secure environments or for
+# the situation where your keys end up in a bad state. If you run in open more
+# you do so at your own risk!
+#open_mode: False
diff --git a/conf/minion b/conf/minion
index 1f37e53ab96..35f5cdc64cb 100644
--- a/conf/minion
+++ b/conf/minion
@@ -8,4 +8,8 @@
 #hostname:
 # Where cace data goes
 #cachedir: /var/cache/salt
-
+# Enable "open mode", this mode still maintains encryption, but turns off
+# authentication, this is only intended for highly secure environments or for
+# the situation where your keys end up in a bad state. If you run in open more
+# you do so at your own risk!
+#open_mode: False