Index: Gruntfile.js
===================================================================
--- Gruntfile.js	(revision 5294)
+++ Gruntfile.js	(working copy)
@@ -190,31 +190,14 @@
 				args: ['-c', 'tests/phpunit/multisite.xml']
 			}
 		},
-		pot:{
-			options: {
-				text_domain: 'bbpress',
-				package_name: 'bbpress',
-				dest: BUILD_DIR,
-				keywords: [
-					'__',
-					'_e',
-					'_x',
-					'_n',
-					'_ex',
-					'_nx',
-					'esc_attr__',
-					'esc_attr_e',
-					'esc_attr_x',
-					'esc_html__',
-					'esc_html_e',
-					'esc_html_x',
-					'_n_noop',
-					'_nx_noop'
-				]
-			},
-			files: {
-				src: SOURCE_DIR + '**/*.php',
-				expand: true
+		makepot: {
+			target: {
+				options: {
+					cwd: 'src',
+					mainFile: SOURCE_DIR + 'bbpress.php',
+					potFilename: '../../' + BUILD_DIR + 'bbpress.pot',
+					type: 'wp-plugin'
+				}
 			}
 		},
 		checktextdomain: {
@@ -292,8 +275,8 @@
 	grunt.registerTask('colors', ['sass:colors']);
 
 	// Build tasks.
-	grunt.registerTask( 'build',         [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'pot' ] );
-	grunt.registerTask( 'build-release', [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'checktextdomain', 'pot', 'phpunit' ] );
+	grunt.registerTask( 'build',         [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'makepot' ] );
+	grunt.registerTask( 'build-release', [ 'clean:all', 'copy:files', 'colors', 'cssjanus:core', 'cssmin:ltr', 'cssmin:rtl', 'uglify:core', 'jsvalidate:build', 'checktextdomain', 'makepot', 'phpunit' ] );
 
 	// Testing tasks.
 	grunt.registerMultiTask( 'phpunit', 'Runs PHPUnit tests, including the ajax and multisite tests.', function() {
Index: package.json
===================================================================
--- package.json	(revision 5293)
+++ package.json	(working copy)
@@ -16,7 +16,7 @@
     "grunt-sass": "~0.10.0",
     "grunt-phpunit": "~0.3.2",
     "grunt-jsvalidate": "~0.2.2",
-    "grunt-pot": "~0.1.2",
+    "grunt-wp-i18n": "~0.3.1",
     "grunt-checktextdomain": "~0.1.1",
     "matchdep": "~0.3.0",
     "grunt-exec": "~0.4.3"