diff --git a/lib/server/generate.js b/lib/server/generate.js
index 83ce922cb8..9383fdb09a 100644
--- a/lib/server/generate.js
+++ b/lib/server/generate.js
@@ -413,6 +413,12 @@ function execute() {
       fs.copySync(file, targetFile);
     }
   });
+
+  /* Generate CNAME file if a custom domain is specified in siteConfig */
+  if (siteConfig.cname) {
+    let targetFile = CWD + "/build/" + siteConfig.projectName + "/CNAME";
+    fs.writeFileSync(targetFile, siteConfig.cname);
+  }
 }
 
 module.exports = execute;