diff --git a/tasks/build.js b/tasks/build.js
index f9c941f7f..c145d2676 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -23,7 +23,9 @@ module.exports = function(callback) {
   // check for right-to-left language
   if(config.rtl === true || config.rtl === 'Yes') {
     gulp.start('build-rtl');
-    return;
+    if(config.rtl !== 'both') {
+      return;
+    }
   }
 
   gulp.start('build-javascript');
diff --git a/tasks/config/project/install.js b/tasks/config/project/install.js
index a0df16d25..7f1a20078 100644
--- a/tasks/config/project/install.js
+++ b/tasks/config/project/install.js
@@ -440,6 +440,10 @@ module.exports = {
             name: 'Yes',
             value: true
           },
+          {
+            name: 'Build Both',
+            value: 'both'
+          }
         ]
       },
       {
diff --git a/tasks/watch.js b/tasks/watch.js
index 09354d152..431082c02 100644
--- a/tasks/watch.js
+++ b/tasks/watch.js
@@ -59,7 +59,9 @@ module.exports = function(callback) {
   // check for right-to-left language
   if(config.rtl === true || config.rtl === 'Yes') {
     gulp.start('watch-rtl');
-    return;
+    if(config.rtl != 'both') {
+      return;
+    }
   }
 
   //console.clear();