diff --git a/maintenancemsg.php b/application/maintenancemsg.php
similarity index 97%
rename from maintenancemsg.php
rename to application/maintenancemsg.php
index 82d24cb25..08885d2d2 100644
--- a/maintenancemsg.php
+++ b/application/maintenancemsg.php
@@ -7,6 +7,7 @@
 
 //
 // Maintenance message display functions
+// Only included by approot.inc.php
 //
 
 /**
diff --git a/approot.inc.php b/approot.inc.php
index 9cc48fe5e..dc2ad4b16 100644
--- a/approot.inc.php
+++ b/approot.inc.php
@@ -31,7 +31,7 @@ if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance)
 
 	http_response_code(503);
 	// Display message depending on the request
-	include(APPROOT.'maintenancemsg.php');
+	include(APPROOT.'application/maintenancemsg.php');
 
 	switch (true)
 	{
diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
index a1057170e..de13f18ea 100644
--- a/setup/setuputils.class.inc.php
+++ b/setup/setuputils.class.inc.php
@@ -1839,7 +1839,7 @@ EOF
 	public final static function EnterMaintenanceMode($oConfig)
 	{
 		@touch(MAINTENANCE_MODE_FILE);
-		SetupPage::log("----> Entering maintenance mode");
+		self::Log("----> Entering maintenance mode");
 		try
 		{
 			// Wait for cron to stop
@@ -1862,7 +1862,7 @@ EOF
 			$iTimeLimit = $iStarted + $iMaxDuration;
 			while ($oMutex->IsLocked())
 			{
-				SetupPage::log("Waiting for cron to stop ($iCount)");
+				self::Log("Waiting for cron to stop ($iCount)");
 				$iCount++;
 				sleep(10);
 				if (time() > $iTimeLimit)
@@ -1882,7 +1882,19 @@ EOF
 		@unlink(MAINTENANCE_MODE_FILE);
 		if ($bLog)
 		{
-			SetupPage::log("<---- Exiting maintenance mode");
+			self::Log("<---- Exiting maintenance mode");
+		}
+	}
+
+	private final static function Log($sText)
+	{
+		if (class_exists('SetupPage'))
+		{
+			SetupPage::log($sText);
+		}
+		else
+		{
+			IssueLog::Info($sText);
 		}
 	}
 }