Index: include/functions_config.inc.php
===================================================================
--- include/functions_config.inc.php	(revision 1658)
+++ include/functions_config.inc.php	(working copy)
@@ -587,12 +587,16 @@
 function serendipity_setCookie($name, $value, $securebyprot = true) {
     global $serendipity;
 
+    $host = $_SERVER['HTTP_HOST'];
     if ($securebyprot) {
         $secure = (strtolower($_SERVER['HTTPS']) == 'on') ? true : false;
+        if ($pos = strpos($host, ":")) {
+            $host = substr($host, 0, $pos);
+        }
     } else {
         $secure = false;
     }
-    setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath'], $_SERVER['HTTP_HOST'], $secure);
+    setcookie("serendipity[$name]", $value, time()+60*60*24*30, $serendipity['serendipityHTTPPath'], $host, $secure);
     $_COOKIE[$name] = $value;
     $serendipity['COOKIE'][$name] = $value;
 }
Index: serendipity_config.inc.php
===================================================================
--- serendipity_config.inc.php	(revision 1658)
+++ serendipity_config.inc.php	(working copy)
@@ -260,6 +260,10 @@
 serendipity_load_configuration();
 $serendipity['lang'] = serendipity_getSessionLanguage();
 
+if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendipity['autodetect_baseURL'])) ||
+     (isset($serendipity['embed']) && serendipity_db_bool($serendipity['embed'])) ) {
+    $serendipity['baseURL'] = 'http' . (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . (!strstr($_SERVER['HTTP_HOST'], ':') && !empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '') . $serendipity['serendipityHTTPPath'];
+}
 /*
  * If a user is logged in, fetch his preferences. He possibly wants to have a different language
  */
@@ -342,12 +346,6 @@
                                          USERLEVEL_CHIEF => USERLEVEL_CHIEF_DESC,
                                          USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC);
 
-
-if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendipity['autodetect_baseURL'])) ||
-     (isset($serendipity['embed']) && serendipity_db_bool($serendipity['embed'])) ) {
-    $serendipity['baseURL'] = 'http' . (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . (!strstr($_SERVER['HTTP_HOST'], ':') && !empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '') . $serendipity['serendipityHTTPPath'];
-}
-
 /*
  *  Check if the installed version is higher than the version of the config
  */