diff --git a/src/Mod/Part/Gui/DlgImportExportIges.ui b/src/Mod/Part/Gui/DlgImportExportIges.ui
index 551016de1..b5d786b0c 100644
--- a/src/Mod/Part/Gui/DlgImportExportIges.ui
+++ b/src/Mod/Part/Gui/DlgImportExportIges.ui
@@ -7,19 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>515</width>
-    <height>349</height>
+    <height>446</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>IGES</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_4">
+  <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Export</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout_4">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -60,10 +60,29 @@
        </widget>
       </item>
       <item row="1" column="0" colspan="3">
-       <widget class="QCheckBox" name="checkBrepMode">
-        <property name="text">
-         <string>Enable B-REP mode</string>
+       <widget class="QGroupBox" name="groupBox_3">
+        <property name="title">
+         <string>Write solids and shells as</string>
         </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QRadioButton" name="radioButtonBRepOff">
+           <property name="text">
+            <string>Groups of Trimmed Surfaces (type 144)</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QRadioButton" name="radioButtonBRepOn">
+           <property name="text">
+            <string>Solids (type 186) and Shells (type 514) / B-REP mode</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
      </layout>
@@ -141,7 +160,8 @@
  </widget>
  <tabstops>
   <tabstop>comboBoxUnits</tabstop>
-  <tabstop>checkBrepMode</tabstop>
+  <tabstop>radioButtonBRepOff</tabstop>
+  <tabstop>radioButtonBRepOn</tabstop>
   <tabstop>checkSkipBlank</tabstop>
   <tabstop>lineEditCompany</tabstop>
   <tabstop>lineEditAuthor</tabstop>
diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
index aa5f456df..fcaec0452 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
@@ -88,6 +88,10 @@ DlgImportExportIges::DlgImportExportIges(QWidget* parent)
     ui = new Ui_DlgImportExportIges();
     ui->setupUi(this);
     ui->lineEditProduct->setReadOnly(true);
+
+    bg = new QButtonGroup(this);
+    bg->addButton(ui->radioButtonBRepOff, 0);
+    bg->addButton(ui->radioButtonBRepOn, 1);
 }
 
 /** 
@@ -117,8 +121,8 @@ void DlgImportExportIges::saveSettings()
             break;
     }
 
-    hGrp->SetBool("BrepMode", ui->checkBrepMode->isChecked());
-    Interface_Static::SetIVal("write.iges.brep.mode",ui->checkBrepMode->isChecked() ? 1 : 0);
+    hGrp->SetBool("BrepMode", bg->checkedId() == 1);
+    Interface_Static::SetIVal("write.iges.brep.mode", bg->checkedId());
 
     // Import
     hGrp->SetBool("SkipBlankEntities", ui->checkSkipBlank->isChecked());
@@ -142,7 +146,10 @@ void DlgImportExportIges::loadSettings()
 
     int value = Interface_Static::IVal("write.iges.brep.mode");
     bool brep = hGrp->GetBool("BrepMode", value > 0);
-    ui->checkBrepMode->setChecked(brep);
+    if (brep)
+        ui->radioButtonBRepOn->setChecked(true);
+    else
+        ui->radioButtonBRepOff->setChecked(true);
 
     // Import
     ui->checkSkipBlank->setChecked(hGrp->GetBool("SkipBlankEntities", true));
diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.h b/src/Mod/Part/Gui/DlgSettingsGeneral.h
index 5dac06fd0..fc995cce3 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.h
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.h
@@ -26,6 +26,8 @@
 
 #include <Gui/PropertyPage.h>
 
+class QButtonGroup;
+
 namespace PartGui {
 
 class Ui_DlgSettingsGeneral;
@@ -62,6 +64,7 @@ protected:
 
 private:
     Ui_DlgImportExportIges* ui;
+    QButtonGroup* bg;
 };
 
 class Ui_DlgImportExportStep;