diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json
new file mode 100644
index 0000000000..8f47962be9
--- /dev/null
+++ b/resources/definitions/ultimaker_original.def.json
@@ -0,0 +1,70 @@
+{
+    "id": "ultimaker_original",
+    "version": 2,
+    "name": "Ultimaker Original",
+    "inherits": "ultimaker",
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker",
+        "file_formats": "text/x-gcode",
+        "icon": "icon_ultimaker.png",
+        "platform": "ultimaker_platform.stl",
+        "pages": [
+            "SelectUpgradedParts",
+            "UpgradeFirmware",
+            "UltimakerCheckup",
+            "BedLeveling"
+        ]
+    },
+
+    "overrides": {
+        "machine_width": {
+            "default": 205
+        },
+        "machine_height": {
+            "default": 200
+        },
+        "machine_depth": {
+            "default": 205
+        },
+        "machine_center_is_zero": {
+            "default": false
+        },
+        "machine_nozzle_size": {
+            "default": 0.4
+        },
+        "machine_nozzle_heat_up_speed": {
+            "default": 2
+        },
+        "machine_nozzle_cool_down_speed": {
+            "default": 2
+        },
+        "machine_head_with_fans_polygon":
+        {
+            "default": [
+                [ -75, 35 ],
+                [ -75, -18 ],
+                [ 18, 35 ],
+                [ 18, -18 ]
+            ]
+        },
+        "gantry_height": {
+            "default": 55
+        },
+        "machine_use_extruder_offset_to_offset_coords": {
+            "default": true
+        },
+        "machine_gcode_flavor": {
+            "default": "RepRap (Marlin/Sprinter)"
+        },
+        "machine_start_gcode": {
+            "default": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
+        },
+        "machine_end_gcode": {
+            "default": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
+        },
+        "machine_extruder_drive_upgrade": {
+            "default": false
+        }
+    }
+}
diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json
deleted file mode 100644
index 3e694c1b8e..0000000000
--- a/resources/machines/ultimaker_original.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "id": "ultimaker_original",
-    "version": 1, 
-    "name": "Ultimaker Original",
-    "manufacturer": "Ultimaker",
-    "author": "Ultimaker",
-    "icon": "icon_ultimaker.png",
-    "platform": "ultimaker_platform.stl",
-    "file_formats": "text/x-gcode",
-    "inherits": "ultimaker.json",
-
-    "pages": [
-        "SelectUpgradedParts",
-        "UpgradeFirmware",
-        "UltimakerCheckup",
-        "BedLeveling"
-    ],
-
-    "machine_extruder_trains": {
-        "0": {
-            "machine_nozzle_heat_up_speed": { 
-                "default": 2.0 
-            },
-            "machine_nozzle_cool_down_speed": { 
-                "default": 2.0 
-            },
-            "machine_nozzle_tip_outer_diameter": {
-                "default": 1
-            },
-            "machine_nozzle_head_distance": {
-                "default": 3
-            },
-            "machine_nozzle_expansion_angle": {
-                "default": 45
-            },
-            "machine_heat_zone_length": { 
-                "default": 16
-            }
-        }
-    },
-    "overrides": {
-        "machine_width": { "default": 205 },
-        "machine_height": { "default": 200 },
-        "machine_depth": { "default": 205 },
-        "machine_center_is_zero": { "default": false },
-        "machine_nozzle_size": { "default": 0.4 },
-        "machine_nozzle_heat_up_speed": { "default": 2.0 },
-        "machine_nozzle_cool_down_speed": { "default": 2.0 },
-        "machine_head_with_fans_polygon":
-        {
-            "default": [
-                [
-                    -75,
-                    35
-                ],
-                [
-                    -75,
-                    -18
-                ],
-                [
-                    18,
-                    35
-                ],
-                [
-                    18,
-                    -18
-                ]
-            ]
-        },
-        "gantry_height": { "default": 55 },
-        "machine_use_extruder_offset_to_offset_coords": { "default": true },
-        "machine_gcode_flavor": { "default": "RepRap (Marlin/Sprinter)" },
-
-        "machine_start_gcode": {
-            "default": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
-        },
-        "machine_end_gcode": {
-            "default": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
-        },
-
-        "machine_extruder_drive_upgrade": { "default": false }
-    }
-}