Index: Gruntfile.js
===================================================================
--- Gruntfile.js	(revision 32055)
+++ Gruntfile.js	(working copy)
@@ -418,18 +418,6 @@
 					'!wp-includes/js/zxcvbn.min.js'
 				]
 			},
-			media: {
-				expand: true,
-				cwd: SOURCE_DIR,
-				dest: BUILD_DIR,
-				ext: '.min.js',
-				src: [
-					'wp-includes/js/media/audio-video.js',
-					'wp-includes/js/media/grid.js',
-					'wp-includes/js/media/models.js',
-					'wp-includes/js/media/views.js'
-				]
-			},
 			jqueryui: {
 				options: {
 					preserveComments: 'some'
@@ -525,6 +513,7 @@
 			all: {
 				files: [
 					SOURCE_DIR + '**',
+					'!' + SOURCE_DIR + 'wp-includes/js/media/**',
 					// Ignore version control directories.
 					'!' + SOURCE_DIR + '**/.{svn,git}/**'
 				],
@@ -540,7 +529,10 @@
 					SOURCE_DIR + 'wp-includes/js/media/*.js',
 					'!' + SOURCE_DIR + 'wp-includes/js/media/*.manifest.js'
 				],
-				tasks: ['uglify:media']
+				tasks: ['copy:dynamic'],
+				options: {
+					spawn: false
+				}
 			},
 			config: {
 				files: 'Gruntfile.js'
@@ -663,22 +655,27 @@
 	// Default task.
 	grunt.registerTask('default', ['build']);
 
-	// Add a listener to the watch task.
-	//
-	// On `watch:all`, automatically updates the `copy:dynamic` and `clean:dynamic`
-	// configurations so that only the changed files are updated.
-	// On `watch:rtl`, automatically updates the `rtlcss:dynamic` configuration.
-	grunt.event.on('watch', function( action, filepath, target ) {
-		if ( target !== 'all' && target !== 'rtl' ) {
+	/*
+	 * Automatically updates the `:dynamic` configurations
+	 * so that only the changed files are updated.
+	 */
+	grunt.event.on( 'watch', function( action, filepath, target ) {
+		var src;
+
+		if ( [ 'all', 'rtl', 'browserify' ].indexOf( target ) === -1 ) {
 			return;
 		}
 
-		var relativePath = path.relative( SOURCE_DIR, filepath ),
-			cleanSrc = ( action === 'deleted' ) ? [relativePath] : [],
-			copySrc = ( action === 'deleted' ) ? [] : [relativePath];
-
-		grunt.config(['clean', 'dynamic', 'src'], cleanSrc);
-		grunt.config(['copy', 'dynamic', 'src'], copySrc);
-		grunt.config(['rtlcss', 'dynamic', 'src'], copySrc);
-	});
+		src = [ path.relative( SOURCE_DIR, filepath ) ];
+
+		if ( action === 'deleted' ) {
+			grunt.config( [ 'clean', 'dynamic', 'src' ], src );
+		} else {
+			grunt.config( [ 'copy', 'dynamic', 'src' ], src );
+
+			if ( target === 'rtl' ) {
+				grunt.config( [ 'rtlcss', 'dynamic', 'src' ], src );
+			}
+		}
+	} );
 };