diff --git a/boot.php b/boot.php
index f4774c4ba..e368896ca 100755
--- a/boot.php
+++ b/boot.php
@@ -1179,6 +1179,13 @@ function check_config(&$a) {
 
 	$a->set_baseurl($a->get_baseurl());
 
+	// Make sure each site has a system channel.  This is now created on install
+	// so we just need to keep this around a couple of weeks until the hubs that
+	// already exist have one
+	$syschan_exists = get_sys_channel();
+		if (! $syschan_exists)
+			create_sys_channel();
+
 	if($build != DB_UPDATE_VERSION) {
 		$stored = intval($build);
 		if(! $stored) {
diff --git a/mod/setup.php b/mod/setup.php
index 14572699e..d12627e84 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -602,6 +602,9 @@ function what_next() {
 	$a = get_app();
 	// install the standard theme
 	set_config('system','allowed_themes','redbasic');
+	// Create a system channel
+	require_once ('include/identity.php');
+	create_sys_channel();	
 	$baseurl = $a->get_baseurl();
 	return 
 		t('<h1>What next</h1>')