diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json
new file mode 100644
index 0000000000..679dcfc35f
--- /dev/null
+++ b/resources/machines/ultimaker2_extended_olsson.json
@@ -0,0 +1,19 @@
+{
+    "id": "ultimaker2_extended_olsson_base",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2.json",
+
+    "machine_settings": {
+        "machine_width": { "default": 230 },
+        "machine_depth": { "default": 225 },
+        "machine_height": { "default": 310 },
+        "machine_show_variants": { "default": true },
+        "gantry_height": { "default": 50 }
+    }
+}
diff --git a/resources/machines/ultimaker2_extended_olsson_025.json b/resources/machines/ultimaker2_extended_olsson_025.json
new file mode 100644
index 0000000000..4a63cd56a6
--- /dev/null
+++ b/resources/machines/ultimaker2_extended_olsson_025.json
@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.25 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.25 }
+    }
+}
diff --git a/resources/machines/ultimaker2_extended_olsson_040.json b/resources/machines/ultimaker2_extended_olsson_040.json
new file mode 100644
index 0000000000..13bc8def5f
--- /dev/null
+++ b/resources/machines/ultimaker2_extended_olsson_040.json
@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.4 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.40 }
+    }
+}
diff --git a/resources/machines/ultimaker2_extended_olsson_060.json b/resources/machines/ultimaker2_extended_olsson_060.json
new file mode 100644
index 0000000000..506f9362e4
--- /dev/null
+++ b/resources/machines/ultimaker2_extended_olsson_060.json
@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.6 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.60 }
+    }
+}
diff --git a/resources/machines/ultimaker2_extended_olsson_080.json b/resources/machines/ultimaker2_extended_olsson_080.json
new file mode 100644
index 0000000000..089a2d5d50
--- /dev/null
+++ b/resources/machines/ultimaker2_extended_olsson_080.json
@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.8 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.80 }
+    }
+}
diff --git a/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml b/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml
index 30b502f446..6a902792e7 100644
--- a/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml
+++ b/resources/qml/WizardPages/SelectUpgradedPartsUM2.qml
@@ -31,7 +31,14 @@ Item
     Component.onDestruction:
     {
         if (hotendCheckBox.checked == true){
-            UM.MachineManager.setMachineDefinitionType("ultimaker2_olsson")
+            switch(UM.MachineManager.getMachineDefinitionType()) {
+                case "ultimaker2":
+                    UM.MachineManager.setMachineDefinitionType("ultimaker2_olsson")
+                    break;
+                case "ultimaker2_extended":
+                    UM.MachineManager.setMachineDefinitionType("ultimaker2_extended_olsson")
+                    break;
+            }
         }
     }
     Label