diff --git a/src/VehicleSetup/FirmwareUpgrade.qml b/src/VehicleSetup/FirmwareUpgrade.qml
new file mode 100644
index 0000000000000000000000000000000000000000..1dcbdcefb7f874dee047c53c510a9a57601f4be1
--- /dev/null
+++ b/src/VehicleSetup/FirmwareUpgrade.qml
@@ -0,0 +1,37 @@
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+
+import QGroundControl.Controls 1.0
+import QGroundControl.FactControls 1.0
+import QGroundControl.Palette 1.0
+
+Rectangle {
+    width: 600
+    height: 400
+
+    property var qgcPal: QGCPalette { colorGroup: QGCPalette.Active }
+
+    color: qgcPal.window
+
+    Text {
+        text: "FIRMWARE UPDATE"
+        color: qgcPal.windowText
+        font.pointSize: 20
+    }
+
+    Column {
+        QGCRadioButton {
+            text: qsTr("Standard Version (stable)")
+        }
+        QGCRadioButton {
+            text: qsTr("Beta Testing (beta)")
+        }
+        QGCRadioButton {
+            text: qsTr("Developer Build (master)")
+        }
+        QGCRadioButton {
+            text: qsTr("Custom firmware file...")
+        }
+    }
+}
diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc
index fd13f54e78b954762ff6c68e518d1c59ae781a78..c4c4db7d11793c3807fac761fa7281edf9753fb2 100644
--- a/src/VehicleSetup/SetupView.cc
+++ b/src/VehicleSetup/SetupView.cc
@@ -132,8 +132,17 @@ void SetupView::_firmwareButtonClicked(void)
         QGCMessageBox::warning("Setup", "Firmware Update cannot be performed while vehicle is armed.");
         return;
     }
-    
+
+#if 1
     PX4FirmwareUpgrade* setup = new PX4FirmwareUpgrade(this);
+#else
+    // NYI
+    QGCQmlWidgetHolder* setup = new QGCQmlWidgetHolder;
+    Q_CHECK_PTR(setup);
+    
+    //setup->setAutoPilot(_autoPilotPlugin);
+    setup->setSource(QUrl::fromUserInput("qrc:/qml/FirmwareUpgrade.qml"));
+#endif
     _changeSetupWidget(setup);
 }