Index: backend/ipp.c
===================================================================
--- backend/ipp.c	(revision 5721)
+++ backend/ipp.c	(working copy)
@@ -230,6 +230,8 @@
 
   if (!strcmp(method, "https"))
     cupsSetEncryption(HTTP_ENCRYPT_ALWAYS);
+  else
+    cupsSetEncryption(HTTP_ENCRYPT_IF_REQUESTED);
 
  /*
   * See if there are any options...
Index: scheduler/listen.c
===================================================================
--- scheduler/listen.c	(revision 5721)
+++ scheduler/listen.c	(working copy)
@@ -331,7 +331,7 @@
     * "any" address...
     */
 
-    if (!LocalPort && p > 0 &&
+    if ((!LocalPort || LocalEncryption == HTTP_ENCRYPT_ALWAYS) && p > 0 &&
         (httpAddrLocalhost(&(lis->address)) ||
          httpAddrAny(&(lis->address))))
     {
@@ -373,6 +373,8 @@
     */
 
     cupsdSetEnv("CUPS_SERVER", have_domain);
+
+    LocalEncryption = HTTP_ENCRYPT_IF_REQUESTED;
   }
   else
   {