diff --git a/Gruntfile.js b/Gruntfile.js
index 775b45fec3e88..e04bf055247c0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -110,7 +110,6 @@ module.exports = function(grunt) {
     'npm-react:release',
   ]);
   grunt.registerTask('build:react-dom', require('./grunt/tasks/react-dom'));
-  grunt.registerTask('build:react-dom-server', require('./grunt/tasks/react-dom-server'));
 
   grunt.registerTask('test', ['jest']);
   grunt.registerTask('npm:test', ['build', 'npm:pack']);
@@ -128,7 +127,6 @@ module.exports = function(grunt) {
     'browserify:min',
     'browserify:addonsMin',
     'build:react-dom',
-    'build:react-dom-server',
     'npm-react:release',
     'npm-react:pack',
     'npm-react-dom:release',
diff --git a/grunt/tasks/npm-react-dom.js b/grunt/tasks/npm-react-dom.js
index d45343423cba5..9856f1b6da9ee 100644
--- a/grunt/tasks/npm-react-dom.js
+++ b/grunt/tasks/npm-react-dom.js
@@ -9,6 +9,8 @@ var dist = dest + 'dist/';
 var distFiles = [
   'react-dom.js',
   'react-dom.min.js',
+  'react-dom-server.js',
+  'react-dom-server.min.js',
 ];
 
 function buildRelease() {
diff --git a/grunt/tasks/react-dom-server.js b/grunt/tasks/react-dom-server.js
deleted file mode 100644
index 49f620aa150f1..0000000000000
--- a/grunt/tasks/react-dom-server.js
+++ /dev/null
@@ -1,27 +0,0 @@
-'use strict';
-
-var grunt = require('grunt');
-var UglifyJS = require('uglify-js');
-
-var LICENSE_TEMPLATE =
-  grunt.file.read('./grunt/data/header-template-extended.txt');
-
-module.exports = function() {
-  var templateData = {
-    package: 'ReactDOMServer',
-    version: grunt.config.data.pkg.version,
-  };
-  var header = grunt.template.process(
-    LICENSE_TEMPLATE,
-    {data: templateData}
-  );
-  var src = grunt.file.read('vendor/react-dom-server.js');
-  grunt.file.write(
-    'build/react-dom-server.js',
-    header + src
-  );
-  grunt.file.write(
-    'build/react-dom-server.min.js',
-    header + UglifyJS.minify(src, {fromString: true}).code
-  );
-};
diff --git a/grunt/tasks/react-dom.js b/grunt/tasks/react-dom.js
index 78fe2b434f74e..77a68d0656ace 100644
--- a/grunt/tasks/react-dom.js
+++ b/grunt/tasks/react-dom.js
@@ -6,22 +6,25 @@ var UglifyJS = require('uglify-js');
 var LICENSE_TEMPLATE =
   grunt.file.read('./grunt/data/header-template-extended.txt');
 
-module.exports = function() {
+function build(name, filename) {
+  var srcFile = `vendor/${filename}.js`;
+  var destFile = `build/${filename}.js`;
+  var destFileMin = `build/${filename}.min.js`;
   var templateData = {
-    package: 'ReactDOM',
+    package: name,
     version: grunt.config.data.pkg.version,
   };
   var header = grunt.template.process(
     LICENSE_TEMPLATE,
     {data: templateData}
   );
-  var src = grunt.file.read('vendor/react-dom.js');
-  grunt.file.write(
-    'build/react-dom.js',
-    header + src
-  );
-  grunt.file.write(
-    'build/react-dom.min.js',
-    header + UglifyJS.minify(src, {fromString: true}).code
-  );
+  var src = grunt.file.read(srcFile);
+  var srcMin = UglifyJS.minify(src, {fromString: true}).code;
+  grunt.file.write(destFile, header + src);
+  grunt.file.write(destFileMin, header + srcMin);
+}
+
+module.exports = function() {
+  build('ReactDOM', 'react-dom');
+  build('ReactDOMServer', 'react-dom-server');
 };
diff --git a/grunt/tasks/release.js b/grunt/tasks/release.js
index c2ccc2b29b187..857c2dbdf368c 100644
--- a/grunt/tasks/release.js
+++ b/grunt/tasks/release.js
@@ -11,6 +11,8 @@ var BOWER_FILES = [
   'react-with-addons.min.js',
   'react-dom.js',
   'react-dom.min.js',
+  'react-dom-server.js',
+  'react-dom-server.min.js',
 ];
 
 var EXAMPLES_PATH = 'examples/';