Index: bbp-loader.php
===================================================================
--- bbp-loader.php	(revision 2564)
+++ bbp-loader.php	(working copy)
@@ -110,10 +110,10 @@
 		// Default slug for topic reply post type
 		if ( !defined( 'BBP_REPLY_SLUG' ) )
 			define( 'BBP_REPLY_SLUG', apply_filters( 'bbp_reply_slug', 'reply' ) );
		
 		// bbPress root directory
-		define( 'BBP_DIR', WP_PLUGIN_DIR . '/bbpress' );
-		define( 'BBP_URL', plugins_url( $path = '/bbpress' ) );
+		define( 'BBP_DIR', plugin_dir_path( __FILE__ ) );
+		define( 'BBP_URL', plugin_dir_url( __FILE__ ) );
 
 		// Images URL
 		define( 'BBP_IMAGES_URL', BBP_URL . '/bbp-images' );
@@ -121,7 +121,8 @@
 		// Themes directory and url
 		define( 'BBP_THEMES_DIR', BBP_DIR . '/bbp-themes' );
 		define( 'BBP_THEMES_URL', BBP_URL . '/bbp-themes' );
		
 		/**
 		 * Constants have been defined
 		 */