diff --git a/config.default.php b/config.default.php
index ff873841..a7eb0a14 100644
--- a/config.default.php
+++ b/config.default.php
@@ -134,6 +134,12 @@ if (!defined('LIME_AUTO_ADVANCE')) define('LIME_AUTO_ADVANCE', true);
  */
 if (!defined('QUEXS_PATH')) define('QUEXS_PATH', '/quexs/');
 
+/**
+ * The port queXS is running on (default blank, use :8080 for example if using 
+ * port 8080)
+ */
+if (!defined('QUEXS_PORT')) define('QUEXS_PORT', '');
+
 $protocol = "http://";
 
 if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER_PORT'] == 443) 
@@ -144,12 +150,12 @@ if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off' || $_SERVER['SERVER
 /**
  * The complete URL to limesurvey
  */
-if (!defined('LIME_URL')) define('LIME_URL', $protocol . $_SERVER['SERVER_NAME'] . QUEXS_PATH . LIME_PATH);
+if (!defined('LIME_URL')) define('LIME_URL', $protocol . $_SERVER['SERVER_NAME'] . QUEXS_PORT . QUEXS_PATH . LIME_PATH);
 
 /**
  * The complete URL to this copy of queXS
  */
-if (!defined('QUEXS_URL')) define('QUEXS_URL', $protocol . $_SERVER['SERVER_NAME'] . QUEXS_PATH);
+if (!defined('QUEXS_URL')) define('QUEXS_URL', $protocol . $_SERVER['SERVER_NAME'] . QUEXS_PORT . QUEXS_PATH);
 
 /**
  * The default locale (language)
diff --git a/config.inc.local.php.example b/config.inc.local.php.example
index 2bdb8273..e620a929 100644
--- a/config.inc.local.php.example
+++ b/config.inc.local.php.example
@@ -57,6 +57,17 @@ define('AUTO_POPUP',false);
  */
 define('QUEXS_PATH', '/quexs/');
 
+/**
+ * The port queXS is running on (leave default)
+ */
+define('QUEXS_PORT', '');
+
+/**
+ * Debugging - disabled
+ */
+define('DEBUG', false);
+
+
 /**
  * Database configuration for queXS
  */