Index: wporg-forums/functions.php
===================================================================
--- wporg-forums/functions.php	(revision 2076)
+++ wporg-forums/functions.php	(working copy)
@@ -121,11 +121,36 @@
  * @package WPBBP
  */
 function wporg_get_global_header() {
-	$GLOBALS['pagetitle'] = wp_title( '«', false, 'right' ) . ' ' . get_bloginfo( 'name' );
+	$GLOBALS['pagetitle'] = wp_get_document_title();
 	require WPORGPATH . 'header.php';
 }
 
+
 /**
+ * Customize document title.
+ *
+ * @param array  $parts The document title parts.
+ * @return array The document title parts.
+ */
+function wporg_remove_forum_name_from_title( $parts ) {
+	// Omit page name from the home page.
+	if ( is_front_page() ) {
+		$parts['title'] = '';
+	}
+
+	// Run the title through bbPress's title customizer.
+	// TODO: Remove this once bbPress deprecates hooking wp_title and hooks
+	// 'document_title_parts' instead.
+	$parts['title'] = bbp_title( $parts['title'], '', 'right' );
+
+	return $parts;
+}
+add_filter( 'document_title_parts', 'wporg_remove_forum_name_from_title' );
+
+// Change the document title separator.
+add_filter( 'document_title_separator', create_function( '$separator', 'return "«";' ) );
+
+/**
  * The Footer for our theme.
  *
  * @package WPBBP