diff --git a/Makefile.in b/Makefile.in
index e5b9a5614..a20f8b80d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,7 +76,7 @@ MSGFMT = msgfmt
 MSGMERGE = msgmerge
 XGETTEXT = xgettext
 XGETTEXT_OPTS = -F -k_ -kN_ -kU_ --copyright-holder="Todd C. Miller" \
-		"--msgid-bugs-address=http://www.sudo.ws/bugs" \
+		"--msgid-bugs-address=https://bugzilla.sudo.ws" \
 		--package-name=@PACKAGE_NAME@ --package-version=$(VERSION) \
 		--flag warning:1:c-format --flag warningx:1:c-format \
 		--flag fatal:1:c-format --flag fatalx:1:c-format \
diff --git a/README b/README
index e6b67df00..8127d9ede 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ Where to find sudo
 Before you try and build sudo, *please* make sure you have the current
 version.  The latest sudo may always be gotten via anonymous ftp from
 ftp.sudo.ws in the directory /pub/sudo/ or from the sudo web site,
-http://www.sudo.ws/
+https://www.sudo.ws/
 
 The distribution is sudo-M.m.tar.gz where `M' is the major version
 number and `m' is the minor version number.  BETA versions of sudo may
@@ -21,7 +21,7 @@ What's new
 See the NEWS file for a list of major changes in this release.
 For a complete list of changes, see the ChangeLog file.  For a
 summary of major changes to the current stable release, see the web
-page, http://www.sudo.ws/sudo/stable.html.
+page, https://www.sudo.ws/stable.html.
 
 If you are upgrading from an earlier version of Sudo, please see
 the UPGRADE file in the doc directory.
@@ -43,17 +43,17 @@ Mailing lists
 =============
 sudo-announce	This list receives announcements whenever a new version
 		of sudo is released.
-		http://www.sudo.ws/mailman/listinfo/sudo-announce
+		https://www.sudo.ws/mailman/listinfo/sudo-announce
 
 sudo-users	This list is for questions and general discussion about sudo.
-		http://www.sudo.ws/mailman/listinfo/sudo-users
+		https://www.sudo.ws/mailman/listinfo/sudo-users
 
 sudo-workers	This list is for people working on and porting sudo.
-		http://www.sudo.ws/mailman/listinfo/sudo-workers
+		https://www.sudo.ws/mailman/listinfo/sudo-workers
 
 sudo-commits	This list receives a message for each commit made to
 		the sudo source repository.
-		http://www.sudo.ws/mailman/listinfo/sudo-commits
+		https://www.sudo.ws/mailman/listinfo/sudo-commits
 
 To subscribe to a list, visit its url (as listed above) and enter
 your email address to subscribe.  Digest versions are available but
@@ -65,14 +65,14 @@ for the appropriate links.
 
 Web page
 ========
-There is a sudo web page at http://www.sudo.ws/ that contains an
+There is a sudo web page at https://www.sudo.ws/ that contains an
 overview of sudo, documentation, downloads, a bug tracker, information
 about beta versions and other useful info.
 
 Bug reports
 ===========
 If you have found what you believe to be a bug, you can file a bug
-report in the sudo bug database, on the web at http://www.sudo.ws/bugs/.
+report in the sudo bug database, on the web at https://bugzilla.sudo.ws/.
 
 Please read over the `TROUBLESHOOTING' file in the doc directory *before*
 submitting a bug report.  When reporting bugs, please be sure to include
diff --git a/configure b/configure
index 593ad0b8a..23ff3e2fc 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,7 @@
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for sudo 1.8.16.
 #
-# Report bugs to <https://www.sudo.ws/bugs/>.
+# Report bugs to <https://bugzilla.sudo.ws/>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -275,7 +275,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: https://www.sudo.ws/bugs/ about your system, including
+$0: https://bugzilla.sudo.ws/ about your system, including
 $0: any error possibly output before this message. Then
 $0: install a modern shell, or manually run the script
 $0: under such a shell if you do have one."
@@ -592,7 +592,7 @@ PACKAGE_NAME='sudo'
 PACKAGE_TARNAME='sudo'
 PACKAGE_VERSION='1.8.16'
 PACKAGE_STRING='sudo 1.8.16'
-PACKAGE_BUGREPORT='https://www.sudo.ws/bugs/'
+PACKAGE_BUGREPORT='https://bugzilla.sudo.ws/'
 PACKAGE_URL=''
 
 ac_unique_file="src/sudo.c"
@@ -1772,7 +1772,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <https://www.sudo.ws/bugs/>.
+Report bugs to <https://bugzilla.sudo.ws/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1995,7 +1995,7 @@ $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## ---------------------------------------- ##
-## Report this to https://www.sudo.ws/bugs/ ##
+## Report this to https://bugzilla.sudo.ws/ ##
 ## ---------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
@@ -24761,7 +24761,7 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <https://www.sudo.ws/bugs/>."
+Report bugs to <https://bugzilla.sudo.ws/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
diff --git a/configure.ac b/configure.ac
index d865491af..fdb47b592 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl
 dnl Copyright (c) 1994-1996,1998-2015 Todd C. Miller <Todd.Miller@courtesan.com>
 dnl
 AC_PREREQ([2.59])
-AC_INIT([sudo], [1.8.16], [https://www.sudo.ws/bugs/], [sudo])
+AC_INIT([sudo], [1.8.16], [https://bugzilla.sudo.ws/], [sudo])
 AC_CONFIG_HEADER([config.h pathnames.h])
 AC_CONFIG_SRCDIR([src/sudo.c])
 dnl
diff --git a/plugins/sudoers/regress/sudoers/test1.in b/plugins/sudoers/regress/sudoers/test1.in
index 70e8a0358..d87c872de 100644
--- a/plugins/sudoers/regress/sudoers/test1.in
+++ b/plugins/sudoers/regress/sudoers/test1.in
@@ -1,6 +1,6 @@
 #
 # Verify that all command tags are parsed OK.
-# See http://www.sudo.ws/bugs/show_bug.cgi?id=437
+# See https://bugzilla.sudo.ws/show_bug.cgi?id=437
 #
 user1 ALL = LOG_INPUT: LOG_OUTPUT: /usr/bin/su -:\
       ALL = NOLOG_INPUT: NOLOG_OUTPUT: /usr/bin/id
diff --git a/sudo.pp b/sudo.pp
index 9d3f293c8..981a19901 100644
--- a/sudo.pp
+++ b/sudo.pp
@@ -44,7 +44,7 @@ still allow people to get their work done."
 	pp_rpm_release="`expr \( $version : '.*p\([0-9][0-9]*\)$' \| 0 \) + 1`"
 	pp_rpm_version="`expr \( $version : '\(.*\)p[0-9][0-9]*$' \| $version \)`"
 	pp_rpm_license="BSD"
-	pp_rpm_url="http://www.sudo.ws/"
+	pp_rpm_url="https://www.sudo.ws/"
 	pp_rpm_group="Applications/System"
 	pp_rpm_packager="Todd C. Miller <Todd.Miller@courtesan.com>"
 	if test -n "$linux_audit"; then
@@ -263,8 +263,8 @@ still allow people to get their work done."
 	cp -p %{pp_wrkdir}/%{name}/DEBIAN/control %{pp_wrkdir}/%{name}/DEBIAN/control.$$
 	sed "s/^\(Depends:.*\) *$/\1, ${DEPENDS}/" %{pp_wrkdir}/%{name}/DEBIAN/control.$$ > %{pp_wrkdir}/%{name}/DEBIAN/control
 	rm -f %{pp_wrkdir}/%{name}/DEBIAN/control.$$
-	echo "Homepage: http://www.sudo.ws/sudo/" >> %{pp_wrkdir}/%{name}/DEBIAN/control
-	echo "Bugs: http://www.sudo.ws/bugs/" >> %{pp_wrkdir}/%{name}/DEBIAN/control
+	echo "Homepage: https://www.sudo.ws/" >> %{pp_wrkdir}/%{name}/DEBIAN/control
+	echo "Bugs: https://bugzilla.sudo.ws" >> %{pp_wrkdir}/%{name}/DEBIAN/control
 
 %files
 %if X"$parentdirs" != X""