diff --git a/core/css/styles.css b/core/css/styles.css
index 20357434c1..868829b1c5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -445,6 +445,11 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 	cursor: default;
 }
 
+#body-login .update {
+	text-align: center;
+	color: #ccc;
+}
+
 #body-user .warning, #body-settings .warning {
 	margin-top: 8px;
 	padding: 5px;
diff --git a/core/templates/update.php b/core/templates/update.admin.php
similarity index 100%
rename from core/templates/update.php
rename to core/templates/update.admin.php
diff --git a/core/templates/update.user.php b/core/templates/update.user.php
new file mode 100644
index 0000000000..bb93f0fad0
--- /dev/null
+++ b/core/templates/update.user.php
@@ -0,0 +1,8 @@
+<ul>
+	<li class='update'>
+		<?php p($l->t('This ownCloud instance is currently being updated, which may take a while.')) ?><br/><br/>
+		<?php p($l->t('Please reload this page after a short time to continue using ownCloud.')) ?><br/><br/>
+		<?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?><br/><br/>
+		<?php p($l->t('Thank you for your patience.')); ?><br/><br/>
+	</li>
+</ul>
diff --git a/lib/base.php b/lib/base.php
index 3f89b51a61..240dd1c12b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -224,7 +224,9 @@ class OC {
 			header('Retry-After: 120');
 
 			// render error page
-			OC_Template::printErrorPage('ownCloud is in maintenance mode');
+			$tmpl = new OC_Template('', 'update.user', 'guest');
+			$tmpl->printPage();
+			die();
 		}
 	}
 
@@ -240,7 +242,7 @@ class OC {
 					$minimizerJS = new OC_Minimizer_JS();
 					$minimizerJS->clearCache();
 					OC_Util::addscript('update');
-					$tmpl = new OC_Template('', 'update', 'guest');
+					$tmpl = new OC_Template('', 'update.admin', 'guest');
 					$tmpl->assign('version', OC_Util::getVersionString());
 					$tmpl->printPage();
 					exit();