diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 64b973176..6936bed60 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -16,6 +16,7 @@
  - fixed #11924: Deleting version tags leaves pending inbox messages in a permanent state
  - intalled YUI fix for flash files.
  - fixed #11932: Bad URL in the newly templated recover password email
+ - fixed #11938: upgrade script always removes specialState
 
 7.10.3
  - fixed #11903: Unnecessary debug in Thingy
diff --git a/sbin/upgrade.pl b/sbin/upgrade.pl
index a4e2dd0bb..6827ac569 100755
--- a/sbin/upgrade.pl
+++ b/sbin/upgrade.pl
@@ -271,7 +271,9 @@ foreach my $filename (keys %config) {
     chdir($currentPath);
 	my $session = WebGUI::Session->open($webguiRoot,$filename);
 	print "\tSetting site upgrade completed..." unless ($quiet);
-	$session->setting->remove('specialState');
+    unless ($skipMaintenance) {
+        $session->setting->remove('specialState');
+    }
 	$session->close();
 	print "OK\n" unless ($quiet);
 }