diff --git a/changelog.html b/changelog.html
index 4cef168af0eb9036c7c427ed4b1b58fce3c3557e..10b046cfddc61273b0cf78dfbea0a466ec08c3f6 100644
--- a/changelog.html
+++ b/changelog.html
@@ -92,6 +92,9 @@ Upcoming changes</a>
   <li class=rfe>
     Added two CLI commands to manipulate job by its XML definition.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-8797">issue 8797</a>)
+  <li class=rfe>
+    Added two CLI commands to shutdown Jenkins
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-6594">issue 6594</a>)
   <li class=rfe>
     Fixed unclear text for Tabs with no jobs
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-9330">issue 9330</a>)
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 04b3b0ce12eb7e46bf8bde10425e1d06b3c4dbd3..160aef81818d964701ee5bc89e6ec0ca9fb34371 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3038,15 +3038,18 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
      * Shutdown the system.
      * @since 1.161
      */
+    @CLIMethod(name="shutdown")
     public void doExit( StaplerRequest req, StaplerResponse rsp ) throws IOException {
         checkPermission(ADMINISTER);
         LOGGER.severe(String.format("Shutting down VM as requested by %s from %s",
-                getAuthentication().getName(), req.getRemoteAddr()));
-        rsp.setStatus(HttpServletResponse.SC_OK);
-        rsp.setContentType("text/plain");
-        PrintWriter w = rsp.getWriter();
-        w.println("Shutting down");
-        w.close();
+                getAuthentication().getName(), req!=null?req.getRemoteAddr():"???"));
+        if (rsp!=null) {
+            rsp.setStatus(HttpServletResponse.SC_OK);
+            rsp.setContentType("text/plain");
+            PrintWriter w = rsp.getWriter();
+            w.println("Shutting down");
+            w.close();
+        }
 
         System.exit(0);
     }
@@ -3056,6 +3059,7 @@ public class Jenkins extends AbstractCIBase implements ModifiableItemGroup<TopLe
      * Shutdown the system safely.
      * @since 1.332
      */
+    @CLIMethod(name="safe-shutdown")
     public HttpResponse doSafeExit(StaplerRequest req) throws IOException {
         checkPermission(ADMINISTER);
         isQuietingDown = true;