diff --git a/flarum b/flarum
index fffdd15..ae12c33 100644
--- a/flarum
+++ b/flarum
@@ -13,6 +13,8 @@ define('FLARUM_START', microtime(true));
 
 require 'vendor/autoload.php';
 
-$server = new Flarum\Console\Server(__DIR__);
-
-$server->listen();
+Flarum\Console\Server::fromSite(
+    (new Flarum\Foundation\Site)
+        ->setBasePath(__DIR__)
+        ->setPublicPath(__DIR__)
+)->listen();
diff --git a/index.php b/index.php
index edf98f0..c495ba2 100644
--- a/index.php
+++ b/index.php
@@ -11,6 +11,8 @@
 
 require 'vendor/autoload.php';
 
-$server = new Flarum\Http\Server(__DIR__);
-
-$server->listen();
+Flarum\Http\Server::fromSite(
+    (new Flarum\Foundation\Site)
+        ->setBasePath(__DIR__)
+        ->setPublicPath(__DIR__)
+)->listen();