diff --git a/composer.json b/composer.json
index 491f4ded..cc6d2ace 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "cachethq/core",
+    "name": "pingoo31/cachet-3-core",
     "description": "Cachet core package.",
     "license": "proprietary",
     "keywords": [
diff --git a/resources/lang/en/component.php b/resources/lang/en/component.php
index 38058faf..e9a225e9 100644
--- a/resources/lang/en/component.php
+++ b/resources/lang/en/component.php
@@ -33,6 +33,7 @@
         'performance_issues' => 'Performance Issues',
         'partial_outage' => 'Partial Outage',
         'major_outage' => 'Major Outage',
+        'under_maintenance' => 'Under maintenance',
         'unknown' => 'Unknown',
     ],
 
diff --git a/resources/lang/en/system_status.php b/resources/lang/en/system_status.php
index feda62e9..54fa3d94 100644
--- a/resources/lang/en/system_status.php
+++ b/resources/lang/en/system_status.php
@@ -4,4 +4,5 @@
     'operational' => 'All systems are operational.',
     'partial_outage' => 'Some systems are experiencing issues.',
     'major_outage' => 'Some systems are experiencing major issues.',
+    'under_maintenance' => 'Some systems are under maintenance.',
 ];
diff --git a/resources/lang/fr/component.php b/resources/lang/fr/component.php
index 6dab49b7..1869e8d0 100644
--- a/resources/lang/fr/component.php
+++ b/resources/lang/fr/component.php
@@ -33,6 +33,7 @@
         'performance_issues' => 'Problèmes de performance',
         'partial_outage' => 'Panne partielle',
         'major_outage' => 'Panne majeure',
+        'under_maintenance' => 'En maintenance',
         'unknown' => 'Inconnu',
     ],
 ];
diff --git a/resources/lang/fr/system_status.php b/resources/lang/fr/system_status.php
index 43f8cd74..f5c51248 100644
--- a/resources/lang/fr/system_status.php
+++ b/resources/lang/fr/system_status.php
@@ -4,4 +4,5 @@
     'operational' => 'Tous les systèmes sont opérationnels.',
     'partial_outage' => 'Certains systèmes rencontrent des problèmes.',
     'major_outage' => 'Certains systèmes rencontrent des problèmes majeurs.',
+    'under_maintenance' => 'Certains systèmes sont en maintenance.',
 ];
diff --git a/resources/svg/component-under-maintenance.svg b/resources/svg/component-under-maintenance.svg
new file mode 100644
index 00000000..ec9b1e19
--- /dev/null
+++ b/resources/svg/component-under-maintenance.svg
@@ -0,0 +1,36 @@
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+     width="20pt" height="20pt" viewBox="0 0 128.000000 128.000000"
+     preserveAspectRatio="xMidYMid meet">
+    <g transform="translate(0.000000,128.000000) scale(0.100000,-0.100000)"
+       fill="#000000" stroke="none">
+        <path d="M913 1250 c-66 -23 -109 -54 -127 -88 -7 -15 -19 -65 -25 -112 l-12
+-85 -77 -77 -77 -78 -67 67 c-65 65 -68 69 -68 116 0 27 -7 61 -16 76 -16 26
+-239 179 -277 189 -13 3 -36 -13 -78 -54 -32 -32 -59 -64 -59 -72 0 -7 38 -71
+84 -142 92 -140 116 -160 188 -160 40 0 48 -5 111 -68 l67 -67 -84 -84 -84
+-84 -93 -14 c-107 -16 -129 -27 -163 -86 -52 -89 -67 -217 -34 -282 25 -46 47
+-40 82 20 47 80 76 107 105 100 34 -8 81 -54 81 -78 0 -11 -16 -45 -35 -77
+-19 -32 -35 -67 -35 -79 0 -19 6 -21 56 -21 49 0 61 4 102 37 117 93 120 97
+128 193 l6 88 84 83 84 84 27 -28 27 -27 -27 -28 c-15 -15 -27 -37 -27 -48 0
+-13 58 -78 158 -176 173 -171 199 -187 287 -174 54 9 120 61 142 113 16 39 17
+101 2 140 -15 40 -318 343 -343 343 -11 0 -33 -12 -48 -27 l-28 -27 -27 27
+-28 27 80 80 80 80 80 0 81 0 40 43 c23 23 58 64 78 92 33 44 37 55 34 99 -4
+65 -17 68 -94 22 -75 -46 -105 -46 -138 -3 -15 19 -26 43 -26 55 0 23 39 59
+106 98 52 31 57 57 14 79 -41 21 -152 19 -217 -5z m99 -70 c-23 -16 -46 -38
+-51 -49 -28 -51 5 -147 62 -181 42 -26 103 -25 145 0 39 24 35 16 -27 -62
+l-46 -58 -84 0 -84 0 -88 -87 c-84 -82 -90 -86 -106 -70 -16 16 -13 22 66 101
+84 84 99 116 57 124 -13 3 -45 -23 -102 -79 -79 -79 -85 -83 -101 -66 -17 16
+-13 22 69 105 l86 87 13 93 c11 87 14 95 44 118 41 31 100 52 149 53 l39 1
+-41 -30z m-735 -61 c60 -39 111 -76 115 -83 31 -47 -35 -146 -97 -146 -39 0
+-49 11 -131 137 l-63 98 31 33 c18 17 33 32 35 32 1 0 51 -32 110 -71z m338
+-419 c151 -151 187 -192 177 -202 -10 -10 -51 26 -204 179 -168 168 -204 213
+-170 213 4 0 93 -85 197 -190z m-75 -66 c12 -13 1 -27 -73 -102 -87 -87 -105
+-123 -71 -136 12 -4 44 21 110 86 89 87 95 91 111 75 16 -16 12 -22 -74 -110
+l-91 -92 -5 -85 -6 -85 -58 -52 c-67 -61 -83 -67 -54 -19 40 63 17 144 -51
+186 -76 46 -129 35 -187 -40 l-34 -45 6 49 c9 64 49 150 79 169 12 8 61 19
+108 26 l85 11 90 90 c49 50 93 90 96 90 4 0 12 -7 19 -16z m680 -432 c0 -78
+-90 -149 -162 -127 -12 4 -87 71 -166 148 l-142 141 87 88 88 88 148 -148
+c142 -144 147 -150 147 -190z"/>
+        <path d="M871 416 c-18 -21 -6 -37 112 -154 105 -105 137 -122 145 -78 3 13
+-30 53 -109 132 -63 63 -119 114 -125 114 -6 0 -17 -6 -23 -14z"/>
+    </g>
+</svg>
diff --git a/src/Enums/ComponentStatusEnum.php b/src/Enums/ComponentStatusEnum.php
index 14b29061..f2c1b5fd 100644
--- a/src/Enums/ComponentStatusEnum.php
+++ b/src/Enums/ComponentStatusEnum.php
@@ -14,6 +14,7 @@ enum ComponentStatusEnum: int implements HasColor, HasIcon, HasLabel
     case partial_outage = 3;
     case major_outage = 4;
     case unknown = 5;
+    case under_maintenance = 6;
 
     public static function outage(): array
     {
@@ -31,6 +32,7 @@ public function getLabel(): string
             self::performance_issues => __('cachet::component.status.performance_issues'),
             self::partial_outage => __('cachet::component.status.partial_outage'),
             self::major_outage => __('cachet::component.status.major_outage'),
+            self::under_maintenance => __('cachet::component.status.under_maintenance'),
             default => __('cachet::component.status.unknown'),
         };
     }
@@ -42,6 +44,7 @@ public function getIcon(): string
             self::performance_issues => 'cachet-component-performance-issues',
             self::partial_outage => 'cachet-component-partial-outage',
             self::major_outage => 'cachet-component-major-outage',
+            self::under_maintenance => 'cachet-component-under-maintenance',
             default => 'cachet-unknown',
         };
     }
@@ -53,6 +56,7 @@ public function getColor(): array
             self::performance_issues => Color::Purple,
             self::partial_outage => Color::Amber,
             self::major_outage => Color::Red,
+            self::under_maintenance => Color::Orange,
             default => Color::Blue,
         };
     }
diff --git a/src/Enums/SystemStatusEnum.php b/src/Enums/SystemStatusEnum.php
index 947e137f..b1f52d80 100644
--- a/src/Enums/SystemStatusEnum.php
+++ b/src/Enums/SystemStatusEnum.php
@@ -12,6 +12,7 @@ enum SystemStatusEnum implements HasColor, HasIcon, HasLabel
     case operational;
     case partial_outage;
     case major_outage;
+    case under_maintenance;
 
     public function getLabel(): string
     {
@@ -19,6 +20,7 @@ public function getLabel(): string
             self::operational => __('cachet::system_status.operational'),
             self::partial_outage => __('cachet::system_status.partial_outage'),
             self::major_outage => __('cachet::system_status.major_outage'),
+            self::under_maintenance => __('cachet::system_status.under_maintenance'),
         };
     }
 
@@ -28,6 +30,7 @@ public function getColor(): array
             self::operational => Color::Green,
             self::partial_outage => Color::Amber,
             self::major_outage => Color::Red,
+            self::under_maintenance => Color::Orange,
         };
     }
 
@@ -37,6 +40,7 @@ public function getIcon(): string
             self::operational => 'heroicon-m-check-circle',
             self::partial_outage => 'cachet-component-partial-outage',
             self::major_outage => 'cachet-component-major-outage',
+            self::under_maintenance => 'cachet-component-under-maintenance',
         };
     }
 }
diff --git a/src/Status.php b/src/Status.php
index 9265a27f..6f71c5ff 100644
--- a/src/Status.php
+++ b/src/Status.php
@@ -24,6 +24,10 @@ public function current(): SystemStatusEnum
     {
         $components = $this->components();
 
+        if ($this->underMaintenance()) {
+            return SystemStatusEnum::under_maintenance;
+        }
+
         if ($this->majorOutage()) {
             return SystemStatusEnum::major_outage;
         }
@@ -39,6 +43,18 @@ public function current(): SystemStatusEnum
         return SystemStatusEnum::partial_outage;
     }
 
+    /**
+     * Determine if the system is under maintenance.
+     */
+    public function underMaintenance(): bool
+    {
+        if ((int) $this->components()->total === 0) {
+            return false;
+        }
+
+        return (int) $this->components()->under_maintenance >= 1;
+    }
+
     /**
      * Determine if there is a major outage.
      */
@@ -67,6 +83,7 @@ public function components(): object
             ->selectRaw('sum(case when status = ? then 1 else 0 end) as performance_issues', [ComponentStatusEnum::performance_issues])
             ->selectRaw('sum(case when status = ? then 1 else 0 end) as partial_outage', [ComponentStatusEnum::partial_outage])
             ->selectRaw('sum(case when status = ? then 1 else 0 end) as major_outage', [ComponentStatusEnum::major_outage])
+            ->selectRaw('sum(case when status = ? then 1 else 0 end) as under_maintenance', [ComponentStatusEnum::under_maintenance])
             ->first();
     }
 
diff --git a/tests/Unit/StatusTest.php b/tests/Unit/StatusTest.php
index 0b71a384..f6326f72 100644
--- a/tests/Unit/StatusTest.php
+++ b/tests/Unit/StatusTest.php
@@ -46,6 +46,14 @@
     $this->assertEquals((new Status)->current(), SystemStatusEnum::operational);
 });
 
+it('can get the current system status as under maintenance', function () {
+    Component::factory()->create([
+        'status' => ComponentStatusEnum::under_maintenance->value,
+    ]);
+
+    $this->assertEquals((new Status)->current(), SystemStatusEnum::under_maintenance);
+});
+
 it('can get the current system status as partial outage', function () {
     Component::factory()->create([
         'status' => ComponentStatusEnum::operational->value,
@@ -73,16 +81,18 @@
             ['status' => ComponentStatusEnum::operational->value],
             ['status' => ComponentStatusEnum::partial_outage->value],
             ['status' => ComponentStatusEnum::major_outage->value],
+            ['status' => ComponentStatusEnum::under_maintenance->value],
         )
-        ->count(4)
+        ->count(5)
         ->create();
 
     $components = (new Status)->components();
 
     expect($components)
-        ->total->toBe(4)
+        ->total->toBe(5)
         ->operational->toBe(1)
         ->performance_issues->toBe(0)
         ->partial_outage->toBe(1)
-        ->major_outage->toBe(1);
+        ->major_outage->toBe(1)
+        ->under_maintenance->toBe(1);
 });