diff --git a/config/setup/tls.go b/config/setup/tls.go
index 93e9324d4..f084e6c6b 100644
--- a/config/setup/tls.go
+++ b/config/setup/tls.go
@@ -1,9 +1,19 @@
 package setup
 
-import "github.com/mholt/caddy/middleware"
+import (
+	"github.com/mholt/caddy/middleware"
+	"log"
+)
 
 func TLS(c *Controller) (middleware.Middleware, error) {
-	c.TLS.Enabled = c.Port != "http"
+	c.TLS.Enabled = true
+	if c.Port == "http" {
+		c.TLS.Enabled = false
+		log.Printf("Warning: TLS was disabled on host http://%s."+
+			" Make sure you are specifying https://%s in your config (if you haven't already)."+
+			" If you meant to serve tls on port 80,"+
+			" specify port 80 in your config (http://%s:80).", c.Host, c.Host, c.Host)
+	}
 
 	for c.Next() {
 		if !c.NextArg() {