diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc
index 995583ac1bef16aec557ec4084176705486d8e1c..195b5c09530eb43b54f5ec641f7c53e1e22aa136 100644
--- a/src/comm/QGCFlightGearLink.cc
+++ b/src/comm/QGCFlightGearLink.cc
@@ -350,20 +350,20 @@ bool QGCFlightGearLink::connectSimulation()
     QString fgRoot;
     QString fgScenery;
     QString terraSyncScenery;
-    QString aircraft;
-
-    if (mav->getSystemType() == MAV_TYPE_FIXED_WING)
-    {
-        aircraft = "Rascal110-JSBSim";
-    }
-    else if (mav->getSystemType() == MAV_TYPE_QUADROTOR)
-    {
-        aircraft = "arducopter";
-    }
-    else
-    {
-        aircraft = "Rascal110-JSBSim";
-    }
+//    QString aircraft;
+
+//    if (mav->getSystemType() == MAV_TYPE_FIXED_WING)
+//    {
+//        aircraft = "Rascal110-JSBSim";
+//    }
+//    else if (mav->getSystemType() == MAV_TYPE_QUADROTOR)
+//    {
+//        aircraft = "arducopter";
+//    }
+//    else
+//    {
+//        aircraft = "Rascal110-JSBSim";
+//    }
 
 #ifdef Q_OS_MACX
     processFgfs = "/Applications/FlightGear.app/Contents/Resources/fgfs";
@@ -486,7 +486,7 @@ bool QGCFlightGearLink::connectSimulation()
     flightGearArguments << QString("--lon=%1").arg(UASManager::instance()->getHomeLongitude());
     flightGearArguments << QString("--altitude=%1").arg(UASManager::instance()->getHomeAltitude());
     // Add new argument with this: flightGearArguments << "";
-    flightGearArguments << QString("--aircraft=%2").arg(aircraft);
+    //flightGearArguments << QString("--aircraft=%2").arg(aircraft);
 
     /*Prepare TerraSync Arguments */
     QStringList terraSyncArguments;
diff --git a/src/ui/QGCHilConfiguration.ui b/src/ui/QGCHilConfiguration.ui
index e51580e74039a37a2a2a7246d8e59b507e2c66cc..e83936f5ed836b65939fbd63741397fc00766775 100644
--- a/src/ui/QGCHilConfiguration.ui
+++ b/src/ui/QGCHilConfiguration.ui
@@ -65,6 +65,9 @@
      <property name="features">
       <set>QDockWidget::NoDockWidgetFeatures</set>
      </property>
+     <property name="windowTitle">
+      <string>Simulator Options</string>
+     </property>
      <widget class="QWidget" name="dockWidgetContents"/>
     </widget>
    </item>
diff --git a/src/ui/QGCHilFlightGearConfiguration.cc b/src/ui/QGCHilFlightGearConfiguration.cc
index 885b95f98a4c54f1d7269c688ff850d95fb2c2b9..2cea13255e01c0703248cd778184b43fdd41ee54 100644
--- a/src/ui/QGCHilFlightGearConfiguration.cc
+++ b/src/ui/QGCHilFlightGearConfiguration.cc
@@ -9,6 +9,22 @@ QGCHilFlightGearConfiguration::QGCHilFlightGearConfiguration(UAS* mav,QWidget *p
     ui(new Ui::QGCHilFlightGearConfiguration)
 {
     ui->setupUi(this);
+
+    QStringList items = QStringList();
+    if (mav->getSystemType() == MAV_TYPE_FIXED_WING)
+    {
+        items << "Rascal110-JSBSim";
+        items << "c172p";
+    }
+    else if (mav->getSystemType() == MAV_TYPE_QUADROTOR)
+    {
+        items << "arducopter";
+    }
+    else
+    {
+        items << "<aircraft>";
+    }
+    ui->aircraftComboBox->addItems(items);
 }
 
 QGCHilFlightGearConfiguration::~QGCHilFlightGearConfiguration()
@@ -18,5 +34,8 @@ QGCHilFlightGearConfiguration::~QGCHilFlightGearConfiguration()
 
 void QGCHilFlightGearConfiguration::on_startButton_clicked()
 {
-    mav->enableHilFlightGear(true, ui->optionsPlainTextEdit->toPlainText());
+    //XXX check validity of inputs
+    QString options = ui->optionsPlainTextEdit->toPlainText();
+    options.append(" --aircraft=" + ui->aircraftComboBox->currentText());
+    mav->enableHilFlightGear(true,  options);
 }
diff --git a/src/ui/QGCHilFlightGearConfiguration.ui b/src/ui/QGCHilFlightGearConfiguration.ui
index 21d8d1c185e2361c7a74df2d0ce6e0ff591c1a4b..e21c7fd0cdb316d3ee193f2da5639fdd0e36c58c 100644
--- a/src/ui/QGCHilFlightGearConfiguration.ui
+++ b/src/ui/QGCHilFlightGearConfiguration.ui
@@ -32,21 +32,14 @@
     <property name="margin">
      <number>9</number>
     </property>
-    <item row="1" column="0">
+    <item row="2" column="0">
      <widget class="QPlainTextEdit" name="optionsPlainTextEdit">
       <property name="plainText">
        <string>--in-air --roll=0 --pitch=0 --vc=90 --heading=300 --timeofday=noon --disable-hud-3d --disable-fullscreen --geometry=400x300 --disable-anti-alias-hud --wind=0@0 --turbulence=0.0 --prop:/sim/frame-rate-throttle-hz=30 --control=mouse --disable-intro-music --disable-sound --disable-random-objects --disable-ai-models --shading-flat --fog-disable --disable-specular-highlight --disable-random-objects --disable-panel --disable-clouds --fdm=jsb --units-meters --notrim --prop:/engines/engine/running=true</string>
       </property>
      </widget>
     </item>
-    <item row="2" column="0">
-     <widget class="QPushButton" name="startButton">
-      <property name="text">
-       <string>Start</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="0">
+    <item row="4" column="0">
      <spacer name="verticalSpacer">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
@@ -59,13 +52,27 @@
       </property>
      </spacer>
     </item>
-    <item row="0" column="0">
+    <item row="1" column="0">
      <widget class="QLabel" name="plaintextInfoLabel">
       <property name="text">
        <string>Additional Options:</string>
       </property>
      </widget>
     </item>
+    <item row="3" column="0">
+     <widget class="QPushButton" name="startButton">
+      <property name="text">
+       <string>Start</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QComboBox" name="aircraftComboBox">
+      <property name="editable">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>