diff --git a/js_src/gcodeGenerating.js b/js_src/gcodeGenerating.js
index 35eab62..08f7808 100644
--- a/js_src/gcodeGenerating.js
+++ b/js_src/gcodeGenerating.js
@@ -284,7 +284,8 @@ function subsituteVariables(gcode) {
   var printerType             = settings["printer.type"];
 
   switch (printerType) {
-    case "makerbot_replicator2": printerType = "r2x"; break; //FIXME: this should be r2, with a separate type for r2x
+    case "makerbot_replicator2": printerType = "r2"; break; 
+    case "makerbot_replicator2x": printerType = "r2x"; break;
     case "makerbot_thingomatic": printerType = "t6"; break;
     case "makerbot_generic": printerType = "r2"; break;
   }
diff --git a/www/settings.html b/www/settings.html
index d738b77..0e5ba3a 100644
--- a/www/settings.html
+++ b/www/settings.html
@@ -20,6 +20,7 @@
         <option value="ultimaker">Ultimaker</option>
         <option value="ultimaker2">Ultimaker2</option>
         <option value="makerbot_replicator2">MakerBot Replicator2</option>
+        <option value="makerbot_replicator2x">MakerBot Replicator2x</option>
         <option value="makerbot_thingomatic">MakerBot Thing-o-matic</option>
         <option value="printrbot">Printrbot</option>
         <option value="bukobot">Bukobot</option>