diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php
index 010a85d596..4fc86a027b 100755
--- a/wp-admin/ms-admin.php
+++ b/wp-admin/ms-admin.php
@@ -1,6 +1,9 @@
 <?php
 require_once('admin.php');
 
+if ( !is_multisite() )
+	wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin');
 $parent_file = 'wpmu-admin.php';
 
@@ -11,7 +14,7 @@ add_action( 'admin_head', 'index_css' );
 
 require_once('admin-header.php');
 
-if( is_site_admin() == false ) {
+if ( is_site_admin() == false ) {
 	wp_die( __('You do not have permission to access this page.') );
 }
 
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index f1d5c345cb..53cbff6280 100755
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -1,5 +1,9 @@
 <?php
 require_once('admin.php');
+
+if ( !is_multisite() )
+	wp_die( __('Multisite support is not enabled.') );
+
 if( is_site_admin() == false ) {
 	wp_die( __('You do not have permission to access this page.') );
 }
diff --git a/wp-admin/ms-options.php b/wp-admin/ms-options.php
index 7be014f8b3..fe2d03d926 100755
--- a/wp-admin/ms-options.php
+++ b/wp-admin/ms-options.php
@@ -1,5 +1,9 @@
 <?php
 require_once('admin.php');
+
+if ( !is_multisite() )
+	wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Site Options');
 $parent_file = 'wpmu-admin.php';
 
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index b9871fb0c9..247c09a2b6 100755
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -1,6 +1,9 @@
 <?php
 require_once('admin.php');
 
+if ( !is_multisite() )
+	wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs');
 $parent_file = 'wpmu-admin.php';
 
diff --git a/wp-admin/ms-upgrade-site.php b/wp-admin/ms-upgrade-site.php
index f379851735..750c6b5995 100755
--- a/wp-admin/ms-upgrade-site.php
+++ b/wp-admin/ms-upgrade-site.php
@@ -1,12 +1,16 @@
 <?php
 require_once('admin.php');
+
+if ( !is_multisite() )
+	wp_die( __('Multisite support is not enabled.') );
+
 require_once( ABSPATH . WPINC . '/http.php' );
 
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Upgrade Site');
 $parent_file = 'wpmu-admin.php';
 require_once('admin-header.php');
 
-if( is_site_admin() == false ) {
+if ( is_site_admin() == false ) {
     wp_die( __('You do not have permission to access this page.') );
 }
 
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php
index a866eee9f3..2d1f856efd 100755
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -1,6 +1,9 @@
 <?php
 require_once('admin.php');
 
+if ( !is_multisite() )
+	wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Users');
 $parent_file = 'wpmu-admin.php';
 
diff --git a/wp-settings.php b/wp-settings.php
index 9ab9a69060..98520ffd90 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -323,6 +323,20 @@ function is_admin() {
 	return false;
 }
 
+/**
+ * Whether Multisite support is enabled
+ * 
+ * @since 3.0
+ *
+ * @return bool True if multisite is enabled, false otherwise.
+ */
+function is_multisite() {
+	if ( defined('MULTISITE') )
+		return true;
+
+	return false;
+}
+
 if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
 	require_once (WP_CONTENT_DIR . '/object-cache.php');
 	$_wp_using_ext_object_cache = true;
@@ -388,6 +402,11 @@ require (ABSPATH . WPINC . '/media.php');
 require (ABSPATH . WPINC . '/http.php');
 require (ABSPATH . WPINC . '/widgets.php');
 
+if ( is_multisite() ) {
+	require_once( ABSPATH . WPINC . '/ms-functions.php' );
+	require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
+}
+
 if ( !defined('WP_CONTENT_URL') )
 	define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up