diff --git a/system/src/Grav/Common/GPM/Local/Package.php b/system/src/Grav/Common/GPM/Local/Package.php
index 594db0997..4f1958daa 100644
--- a/system/src/Grav/Common/GPM/Local/Package.php
+++ b/system/src/Grav/Common/GPM/Local/Package.php
@@ -91,6 +91,10 @@ class Package extends BasePackage
                 continue;
             }
 
+            if (version_compare($m[1], '2.0', '>=')) {
+                return ['grav' => ['2.0'], 'api' => []];
+            }
+
             if (version_compare($m[1], '1.8', '>=')) {
                 return ['grav' => ['1.8'], 'api' => []];
             }
diff --git a/system/src/Grav/Console/Gpm/IndexCommand.php b/system/src/Grav/Console/Gpm/IndexCommand.php
index 5669271d6..2ba19f255 100644
--- a/system/src/Grav/Console/Gpm/IndexCommand.php
+++ b/system/src/Grav/Console/Gpm/IndexCommand.php
@@ -260,6 +260,9 @@ class IndexCommand extends GpmCommand
         if (in_array('1.8', $compat['grav'], true)) {
             $badges[] = '<green>1.8</green>';
         }
+        if (in_array('2.0', $compat['grav'], true)) {
+            $badges[] = '<magenta>2.0</magenta>';
+        }
 
         return implode(' ', $badges);
     }
diff --git a/system/src/Grav/Console/Gpm/InfoCommand.php b/system/src/Grav/Console/Gpm/InfoCommand.php
index 56d2a017e..2fa48e82e 100644
--- a/system/src/Grav/Console/Gpm/InfoCommand.php
+++ b/system/src/Grav/Console/Gpm/InfoCommand.php
@@ -150,6 +150,9 @@ class InfoCommand extends GpmCommand
             if (in_array('1.8', $compat['grav'], true)) {
                 $badges[] = '<green>1.8</green>';
             }
+            if (in_array('2.0', $compat['grav'], true)) {
+                $badges[] = '<magenta>2.0</magenta>';
+            }
             $compatStr = implode(' ', $badges);
         } else {
             $compatStr = '<blue>1.7</blue>';
diff --git a/system/src/Grav/Console/Gpm/UpdateCommand.php b/system/src/Grav/Console/Gpm/UpdateCommand.php
index 15ea1c196..11e9bdd14 100644
--- a/system/src/Grav/Console/Gpm/UpdateCommand.php
+++ b/system/src/Grav/Console/Gpm/UpdateCommand.php
@@ -222,6 +222,9 @@ class UpdateCommand extends GpmCommand
                     if (in_array('1.8', $compat['grav'], true)) {
                         $badges[] = '<green>1.8</green>';
                     }
+                    if (in_array('2.0', $compat['grav'], true)) {
+                        $badges[] = '<magenta>2.0</magenta>';
+                    }
                     $compatStr = ' ' . implode(' ', $badges);
                 }
 
diff --git a/system/src/Grav/Installer/Install.php b/system/src/Grav/Installer/Install.php
index 858c6153d..6d8d1e445 100644
--- a/system/src/Grav/Installer/Install.php
+++ b/system/src/Grav/Installer/Install.php
@@ -1448,6 +1448,10 @@ ERR;
                 continue;
             }
 
+            if (version_compare($m[1], '2.0', '>=')) {
+                return ['grav' => ['2.0'], 'api' => []];
+            }
+
             if (version_compare($m[1], '1.8', '>=')) {
                 return ['grav' => ['1.8'], 'api' => []];
             }