diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 42a26ddfcb..296f3c0ca6 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -244,7 +244,7 @@ $menu[75] = array( __('Tools'), 'edit_posts', 'tools.php', '', 'menu-top menu-ic
 	if ( is_multisite() && !is_main_site() )
 		$submenu['tools.php'][25] = array( __('Delete Site'), 'delete_site', 'ms-delete-site.php' );
 	if ( ! is_multisite() && defined('WP_ALLOW_MULTISITE') && WP_ALLOW_MULTISITE )
-		$submenu['tools.php'][50] = array(__('Network Setup'), 'manage_options', 'network.php');
+		$submenu['tools.php'][50] = array(__('Network Setup'), 'setup_network', 'network.php');
 
 $menu[80] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
 	$submenu['options-general.php'][10] = array(_x('General', 'settings screen'), 'manage_options', 'options-general.php');
diff --git a/wp-admin/network.php b/wp-admin/network.php
index cce5ebfbf1..027449e042 100644
--- a/wp-admin/network.php
+++ b/wp-admin/network.php
@@ -15,7 +15,7 @@ define( 'WP_INSTALLING_NETWORK', true );
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_super_admin() ) {
+if ( ! current_user_can( 'setup_network' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
 }
 
diff --git a/wp-admin/network/menu.php b/wp-admin/network/menu.php
index 1cb22f2223..41281e7d56 100644
--- a/wp-admin/network/menu.php
+++ b/wp-admin/network/menu.php
@@ -53,7 +53,7 @@ $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugin
 $menu[25] = array(__('Settings'), 'manage_network_options', 'settings.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings');
 if ( defined( 'MULTISITE' ) && defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) {
 	$submenu['settings.php'][5]  = array( __('Network Settings'), 'manage_network_options', 'settings.php' );
-	$submenu['settings.php'][10] = array( __('Network Setup'), 'manage_network_options', 'setup.php' );
+	$submenu['settings.php'][10] = array( __('Network Setup'), 'setup_network', 'setup.php' );
 }
 unset($update_data);
 
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 78cde1c2ee..1e16f32cb6 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -480,6 +480,13 @@ function map_meta_cap( $cap, $user_id ) {
 	case 'manage_network_options':
 		$caps[] = $cap;
 		break;
+	case 'setup_network':
+		if ( is_multisite() ) {
+			$caps[] = 'manage_network_options';
+		} else {
+			$caps[] = 'manage_options';
+		}
+		break;
 	default:
 		// Handle meta capabilities for custom post types.
 		global $post_type_meta_caps;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 39dac33ffa..f75962b04a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.8-alpha-40387';
+$wp_version = '4.8-alpha-40390';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.