diff --git a/core/util.inc.php b/core/util.inc.php
index b09acc06..df9f2086 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -97,7 +97,7 @@ function make_link($page=null, $query=null) {
 
 	if(is_null($page)) $page = $config->get_string('main_page');
 
-	$base = $config->get_string('base_href', './index.php?q=');
+	$base = $config->get_string('base_href');
 
 	if(is_null($query)) {
 		return "$base/$page";
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 763a94f4..f009e8c2 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -133,6 +133,7 @@ class Setup extends Extension {
 			$config->set_default_string("title", "Shimmie");
 			$config->set_default_string("front_page", "post/list");
 			$config->set_default_string("main_page", "post/list");
+			$config->set_default_string("base_href", "./index.php?q=");
 		}
 
 		if(is_a($event, 'PageRequestEvent') && ($event->page_name == "setup")) {