diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 17f561efcc5..0d4a2243d46 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -2034,6 +2034,18 @@ function system_update_8015() {
   }
 }
 
+/**
+ * Move the system maintenance settings from variable to config.
+ *
+ * @ingroup config_upgrade
+ */
+function system_update_8015() {
+  update_variables_to_config('system.maintenance', array(
+    'maintenance_mode' => 'enabled',
+    'maintenance_mode_message' => 'message',
+  ));
+}
+
 /**
  * @} End of "defgroup updates-7.x-to-8.x".
  * The next series of updates should start at 9000.