diff --git a/drivers/KirbyValetDriver.php b/drivers/KirbyValetDriver.php
new file mode 100644
index 0000000..7d87c65
--- /dev/null
+++ b/drivers/KirbyValetDriver.php
@@ -0,0 +1,60 @@
+<?php
+
+class KirbyValetDriver 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)
+    {
+        return is_dir($sitePath.'/kirby');
+    }
+
+    /**
+     * 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)) {
+           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)
+    {
+        // Needed to force Kirby to use *.dev to generate its URLs...
+        $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
+
+        if (preg_match('/^\/panel/', $uri)) {
+            $_SERVER['SCRIPT_NAME'] = '/panel/index.php';
+
+            return $sitePath.'/panel/index.php';
+        }
+
+        if (file_exists($indexPath = $sitePath.'/index.php')) {
+            $_SERVER['SCRIPT_NAME'] = '/index.php';
+
+            return $indexPath;
+        }
+    }
+}
diff --git a/drivers/ValetDriver.php b/drivers/ValetDriver.php
index 19eec50..6568d7d 100644
--- a/drivers/ValetDriver.php
+++ b/drivers/ValetDriver.php
@@ -52,6 +52,7 @@ public static function assign($sitePath, $siteName, $uri)
         $drivers[] = 'StatamicValetDriver';
         $drivers[] = 'SculpinValetDriver';
         $drivers[] = 'JigsawValetDriver';
+        $drivers[] = 'KirbyValetDriver';
 
         $drivers[] = 'BasicValetDriver';
 
diff --git a/drivers/require.php b/drivers/require.php
index 308ee0d..7802bdd 100644
--- a/drivers/require.php
+++ b/drivers/require.php
@@ -11,6 +11,7 @@
  */
 require_once __DIR__.'/CraftValetDriver.php';
 require_once __DIR__.'/JigsawValetDriver.php';
+require_once __DIR__.'/KirbyValetDriver.php';
 require_once __DIR__.'/LaravelValetDriver.php';
 require_once __DIR__.'/SculpinValetDriver.php';
 require_once __DIR__.'/StatamicValetDriver.php';