diff --git a/core/src/main/java/jenkins/security/admin/MasterKillSwitchWarning.java b/core/src/main/java/jenkins/security/admin/MasterKillSwitchWarning.java
new file mode 100644
index 0000000000..182de24685
--- /dev/null
+++ b/core/src/main/java/jenkins/security/admin/MasterKillSwitchWarning.java
@@ -0,0 +1,43 @@
+package jenkins.security.admin;
+
+import hudson.Extension;
+import hudson.model.AdministrativeMonitor;
+import jenkins.model.Jenkins;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.HttpResponses;
+import org.kohsuke.stapler.QueryParameter;
+
+import javax.inject.Inject;
+import java.io.IOException;
+
+/**
+ * If {@link AdminWhitelistRule#masterKillSwitch} is on, warn the user.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 1.THU
+ */
+@Extension
+public class MasterKillSwitchWarning extends AdministrativeMonitor {
+    @Inject
+    AdminWhitelistRule rule;
+
+    @Inject
+    Jenkins jenkins;
+
+    @Override
+    public boolean isActivated() {
+        return rule.getMasterKillSwitch()
+            && jenkins.getComputers().length>1  // if there's no slave, there's no point
+            && jenkins.isUseSecurity()          // if security is off, likewise this is pointless
+            ;
+    }
+
+    public HttpResponse doAct(@QueryParameter String dismiss) throws IOException {
+        if(dismiss!=null) {
+            disable(true);
+            return HttpResponses.redirectViaContextPath("/manage");
+        } else {
+            return HttpResponses.redirectViaContextPath("configureSecurity");
+        }
+    }
+}
diff --git a/core/src/main/resources/jenkins/security/admin/MasterKillSwitchWarning/message.jelly b/core/src/main/resources/jenkins/security/admin/MasterKillSwitchWarning/message.jelly
new file mode 100644
index 0000000000..6192f8b897
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/admin/MasterKillSwitchWarning/message.jelly
@@ -0,0 +1,36 @@
+<!--
+The MIT License
+
+Copyright (c) 2014, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
+  <div class="warning" style="padding-top:1em; padding-bottom:1em">
+    <form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
+      <div style="float:right">
+        <f:submit name="examine" value="${%Examine}"/>
+        <f:submit name="dismiss" value="${%Dismiss}"/>
+      </div>
+      ${%blurb}
+    </form>
+  </div>
+</j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/jenkins/security/admin/MasterKillSwitchWarning/message.properties b/core/src/main/resources/jenkins/security/admin/MasterKillSwitchWarning/message.properties
new file mode 100644
index 0000000000..7c847a2111
--- /dev/null
+++ b/core/src/main/resources/jenkins/security/admin/MasterKillSwitchWarning/message.properties
@@ -0,0 +1,2 @@
+blurb=Slave to master security subsystem is currently off. \
+  <a href="http://jenkins-ci.org/security-144">Please read the documentation</a> and consider turning it on.
\ No newline at end of file