Index: bb-base/functions.php
===================================================================
--- bb-base/functions.php	(revision 953)
+++ bb-base/functions.php	(working copy)
@@ -498,3 +498,8 @@
 	}
 }
 add_action( 'bbp_template_redirect', 'bb_base_recount_current_thing' );
+
+function bb_base_register_menus() {
+	register_nav_menu( 'header-nav-menu', 'Main nav bar' );
+}
+add_action( 'init', 'bb_base_register_menus' );
Index: bb-base/header-nav.php
===================================================================
--- bb-base/header-nav.php	(revision 953)
+++ bb-base/header-nav.php	(working copy)
@@ -1,9 +1,18 @@
-<ul id="nav" class="menu">
-	<li <?php if ( is_page( 'about'    ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'about'   ); ?>">About</a></li>
-	<li <?php if ( is_page( 'plugins'  ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'plugins' ); ?>">Plugins</a></li>
-	<li <?php if ( is_page( 'themes'   ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'themes'  ); ?>">Themes</a></li>
-	<li><a href="<?php echo esc_url( '//codex.' . parse_url( home_url(), PHP_URL_HOST ) . '/' ); ?>">Documentation</a></li>
-	<li <?php if ( is_post_type_archive( 'post' ) || is_singular( 'post' ) || is_date() || is_tag() || is_category() || is_home() ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'blog' ); ?>">Blog</a></li>
-	<?php if ( function_exists( 'is_bbpress' ) ) : ?><li <?php if ( is_bbpress() ) : ?>class="current"<?php endif; ?>><a href="<?php bbp_forums_url(); ?>">Support</a></li><?php endif; ?>
-	<li class="download<?php if ( is_page( 'download' ) ) : ?> current<?php endif; ?>"><a href="<?php echo home_url( 'download' ); ?>">Download</a></li>
-</ul>
\ No newline at end of file
+<?php if ( ! has_nav_menu( 'header-nav-menu' ) ) : ?>
+	<ul id="nav" class="menu">
+		<li <?php if ( is_page( 'about'    ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'about'   ); ?>">About</a></li>
+		<li <?php if ( is_page( 'plugins'  ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'plugins' ); ?>">Plugins</a></li>
+		<li <?php if ( is_page( 'themes'   ) ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'themes'  ); ?>">Themes</a></li>
+		<li><a href="<?php echo esc_url( '//codex.' . parse_url( home_url(), PHP_URL_HOST ) . '/' ); ?>">Documentation</a></li>
+		<li <?php if ( is_post_type_archive( 'post' ) || is_singular( 'post' ) || is_date() || is_tag() || is_category() || is_home() ) : ?>class="current"<?php endif; ?>><a href="<?php echo home_url( 'blog' ); ?>">Blog</a></li>
+		<?php if ( function_exists( 'is_bbpress' ) ) : ?><li <?php if ( is_bbpress() ) : ?>class="current"<?php endif; ?>><a href="<?php bbp_forums_url(); ?>">Support</a></li><?php endif; ?>
+		<li class="download<?php if ( is_page( 'download' ) ) : ?> current<?php endif; ?>"><a href="<?php echo home_url( 'download' ); ?>">Download</a></li>
+	</ul>
+<?php else: ?>
+	<?php wp_nav_menu( array(
+			'container'      => '',
+			'menu_class'     => 'menu',
+			'menu_id'        => 'nav',
+			'theme_location' => 'header-nav-menu',
+		) ); ?>
+<?php endif; ?>
\ No newline at end of file
Index: bb-base/style-bbpress.css
===================================================================
--- bb-base/style-bbpress.css	(revision 953)
+++ bb-base/style-bbpress.css	(working copy)
@@ -34,6 +34,7 @@
 }
 
 #nav li.current a,
+#nav li.current-menu-item a,
 #nav li a:hover,
 .button:hover {
 	color: rgba(235,255,235,0.9);
@@ -73,6 +74,7 @@
 }
 
 #nav li.current a,
+#nav li.current-menu-item a,
 #nav li a:active,
 .button:active {
 	background-image: -moz-linear-gradient(top, #009933 0%, #008800 100%);
Index: bb-base/style-buddypress.css
===================================================================
--- bb-base/style-buddypress.css	(revision 953)
+++ bb-base/style-buddypress.css	(working copy)
@@ -61,6 +61,7 @@
 	color: rgba(255,255,255,0.9);
 }
 
+#nav li.current-menu-item a,
 #nav li.current a,
 #nav li a:active {
 	background-color: #dd823b;