diff --git a/CHANGELOG b/CHANGELOG
index 2ea3c5dc2..7c286ef6c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,9 @@ o Fix Ncat listen mode on Solaris and other platforms where struct sockaddr
   does not have a sa_len member. This also affected use of the -p and -s
   options. Brandon Haberfeld reported the crash. [Daniel Miller]
 
+o Report our https URL (https://nmap.org) in more places rather than
+  our non-SSL one. [David Fifield]
+
 o [NSE] Fix Diffie-Hellman parameter extraction in tls.lua. [Jacob Gajek]
 
 o [NSE] Added http-webdav-scan, which detects WebDAV installations. [Gyanendra Mishra]
diff --git a/Makefile.in b/Makefile.in
index 904c1c228..7e7245176 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
 export NMAP_UPDATE_CHANNEL := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_UPDATE_CHANNEL' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
 NMAP_NAME= Nmap
-NMAP_URL= http://nmap.org
+NMAP_URL= https://nmap.org
 NMAP_PLATFORM=@host@
 datarootdir = @datarootdir@
 prefix = @prefix@
diff --git a/nmap.cc b/nmap.cc
index 0e4217eec..4908a575a 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -339,7 +339,7 @@ static void printusage(int rc) {
          "  nmap -v -A scanme.nmap.org\n"
          "  nmap -v -sn 192.168.0.0/16 10.0.0.0/8\n"
          "  nmap -v -iR 10000 -Pn -p 80\n"
-         "SEE THE MAN PAGE (http://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES\n", NMAP_NAME, NMAP_VERSION, NMAP_URL);
+         "SEE THE MAN PAGE (https://nmap.org/book/man.html) FOR MORE OPTIONS AND EXAMPLES\n", NMAP_NAME, NMAP_VERSION, NMAP_URL);
   exit(rc);
 }
 
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index 2e8a1d732..a0bda6f04 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -131,7 +131,7 @@
    like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
 #define NMAP_NAME "Nmap"
-#define NMAP_URL "http://nmap.org"
+#define NMAP_URL "https://nmap.org"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
 #define NMAPDATADIR "c:\\nmap" /* FIXME: I really need to make this dynamic */