diff --git a/admin.go b/admin.go
index f3337b0c9..ba704e6fe 100644
--- a/admin.go
+++ b/admin.go
@@ -24,10 +24,12 @@ import (
 	"net"
 	"net/http"
 	"net/http/pprof"
+	"os"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/mholt/certmagic"
 	"github.com/rs/cors"
 )
 
@@ -83,6 +85,7 @@ func StartAdmin(initialConfigJSON []byte) error {
 
 	mux := http.NewServeMux()
 	mux.HandleFunc("/load", handleLoadConfig)
+	mux.HandleFunc("/stop", handleStop)
 
 	///// BEGIN PPROF STUFF (TODO: Temporary) /////
 	mux.HandleFunc("/debug/pprof/", pprof.Index)
@@ -149,7 +152,7 @@ type AdminRoute struct {
 
 func handleLoadConfig(w http.ResponseWriter, r *http.Request) {
 	r.Close = true
-	if r.Method != "POST" {
+	if r.Method != http.MethodPost {
 		http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
 		return
 	}
@@ -167,6 +170,27 @@ func handleLoadConfig(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func handleStop(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodPost {
+		http.Error(w, http.StatusText(http.StatusMethodNotAllowed), http.StatusMethodNotAllowed)
+		return
+	}
+	log.Println("[ADMIN] Initiating shutdown")
+	if err := stopAndCleanup(); err != nil {
+		log.Printf("[ADMIN][ERROR] stopping: %v \n", err)
+	}
+	log.Println("[ADMIN] Exiting")
+	os.Exit(0)
+}
+
+func stopAndCleanup() error {
+	if err := Stop(); err != nil {
+		return err
+	}
+	certmagic.CleanUpOwnLocks()
+	return nil
+}
+
 // Load loads and starts a configuration.
 func Load(r io.Reader) error {
 	buf := bufPool.Get().(*bytes.Buffer)
diff --git a/sigtrap.go b/sigtrap.go
index 65f1e964f..8fae706ad 100644
--- a/sigtrap.go
+++ b/sigtrap.go
@@ -18,8 +18,6 @@ import (
 	"log"
 	"os"
 	"os/signal"
-
-	"github.com/mholt/certmagic"
 )
 
 // TrapSignals create signal/interrupt handlers as best it can for the
@@ -57,16 +55,12 @@ func trapSignalsCrossPlatform() {
 func gracefulStop(sigName string) {
 	exitCode := ExitCodeSuccess
 
-	// first stop all the apps
-	err := Stop()
+	err := stopAndCleanup()
 	if err != nil {
 		log.Printf("[ERROR] %s stop: %v", sigName, err)
 		exitCode = ExitCodeFailedQuit
 	}
 
-	// always, always, always try to clean up locks
-	certmagic.CleanUpOwnLocks()
-
 	log.Printf("[INFO] %s: Shutdown done", sigName)
 	os.Exit(exitCode)
 }