diff --git a/cli/drivers/ValetDriver.php b/cli/drivers/ValetDriver.php
index f7e3669..ada07e0 100644
--- a/cli/drivers/ValetDriver.php
+++ b/cli/drivers/ValetDriver.php
@@ -59,6 +59,7 @@ public static function assign($sitePath, $siteName, $uri)
         $drivers[] = 'ContaoValetDriver';
         $drivers[] = 'KatanaValetDriver';
         $drivers[] = 'JoomlaValetDriver';
+        $drivers[] = 'DrupalValetDriver';
 
         $drivers[] = 'BasicValetDriver';
 
diff --git a/cli/drivers/require.php b/cli/drivers/require.php
index 7434d6b..9842873 100644
--- a/cli/drivers/require.php
+++ b/cli/drivers/require.php
@@ -23,3 +23,4 @@
 require_once __DIR__.'/KatanaValetDriver.php';
 require_once __DIR__.'/CakeValetDriver.php';
 require_once __DIR__.'/JoomlaValetDriver.php';
+require_once __DIR__.'/DrupalValetDriver.php';
diff --git a/drivers/DrupalValetDriver.php b/drivers/DrupalValetDriver.php
new file mode 100644
index 0000000..19bdd5e
--- /dev/null
+++ b/drivers/DrupalValetDriver.php
@@ -0,0 +1,73 @@
+<?php
+
+class DrupalValetDriver extends ValetDriver
+{
+    /**
+     * Determine if the driver serves the request.
+     *
+     * @param  string  $sitePath
+     * @param  string  $siteName
+     * @param  string  $uri
+     * @return void
+     */
+    public function serves($sitePath, $siteName, $uri)
+    {
+      /**
+       * /misc/drupal.js = Drupal 7
+       * /core/lib/Drupal.php = Drupal 8
+       */
+      if (file_exists($sitePath.'/misc/drupal.js') ||
+          file_exists($sitePath.'/core/lib/Drupal.php')) {
+            return true;
+        }
+    }
+
+    /**
+     * Determine if the incoming request is for a static file.
+     *
+     * @param  string  $sitePath
+     * @param  string  $siteName
+     * @param  string  $uri
+     * @return string|false
+     */
+    public function isStaticFile($sitePath, $siteName, $uri)
+    {
+        if (file_exists($sitePath.$uri) &&
+            ! is_dir($sitePath.$uri) &&
+            pathinfo($sitePath.$uri)['extension'] != 'php') {
+            return $sitePath.$uri;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the fully resolved path to the application's front controller.
+     *
+     * @param  string  $sitePath
+     * @param  string  $siteName
+     * @param  string  $uri
+     * @return string
+     */
+    public function frontControllerPath($sitePath, $siteName, $uri)
+    {
+        if (!empty($uri) && $uri !== '/') {
+          $_GET['q'] = $uri;
+        }
+
+        $matches = [];
+        if (preg_match('/^\/(.*?)\.php/', $uri, $matches)) {
+            $filename = $matches[0];
+            if (file_exists($sitePath.$filename) && ! is_dir($sitePath.$filename)) {
+                $_SERVER['SCRIPT_FILENAME'] = $sitePath.$filename;
+                $_SERVER['SCRIPT_NAME'] = $filename;
+                return $sitePath.$filename;
+            }
+        }
+
+        // Fallback
+        $_SERVER['SCRIPT_FILENAME'] = $sitePath.'/index.php';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        return $sitePath.'/index.php';
+    }
+}