diff --git a/includes/system.php b/includes/system.php
index 55d98dca..83283c3a 100755
--- a/includes/system.php
+++ b/includes/system.php
@@ -65,7 +65,6 @@ function DisplaySystem()
     $status = new StatusMessages();
     $system = new System();
 
-
     if (isset($_POST['SaveLanguage'])) {
         if (isset($_POST['locale'])) {
             $_SESSION['locale'] = $_POST['locale'];
@@ -73,6 +72,24 @@ function DisplaySystem()
         }
     }
 
+    if (isset($_POST['SaveServerPort'])) {
+        if (isset($_POST['serverPort'])) {
+            if (strlen($_POST['serverPort']) > 4 || !is_numeric($_POST['serverPort'])) {
+                $status->addMessage('Invalid value for port number', 'danger');
+            } else {
+                $serverPort = escapeshellarg($_POST['serverPort']);
+                exec("sudo /etc/raspap/lighttpd/configport.sh $serverPort " .RASPI_LIGHTTPD_CONFIG. " ".$_SERVER['SERVER_NAME'], $return);
+                foreach ($return as $line) {
+                    $status->addMessage($line, 'info');
+                }
+            }
+        }
+    }
+
+    exec('cat '. RASPI_LIGHTTPD_CONFIG, $return);
+    $conf = ParseConfig($return);
+    $ServerPort = $conf['server.port'];
+
     // define locales
     $arrLocales = array(
         'en_GB.UTF-8' => 'English',
@@ -104,5 +121,5 @@ function DisplaySystem()
         $result = shell_exec("sudo /sbin/shutdown -h now");
     }
 
-    echo renderTemplate("system", compact("arrLocales", "status", "system"));
+    echo renderTemplate("system", compact("arrLocales", "status", "system", "ServerPort"));
 }