diff --git a/src/Mod/Part/App/AppPart.cpp b/src/Mod/Part/App/AppPart.cpp
index 52ac22129c..d00e2a431b 100644
--- a/src/Mod/Part/App/AppPart.cpp
+++ b/src/Mod/Part/App/AppPart.cpp
@@ -324,6 +324,9 @@ void PartExport initPart()
             Interface_Static::SetCVal("write.step.unit","MM");
             break;
     }
+
+    std::string ap = hStepGrp->GetASCII("Scheme", Interface_Static::CVal("write.step.schema"));
+    Interface_Static::SetCVal("write.step.schema", ap.c_str());
 }
 
 } // extern "C"
diff --git a/src/Mod/Part/Gui/DlgImportExportStep.ui b/src/Mod/Part/Gui/DlgImportExportStep.ui
index 2f13c76775..f7dd481e24 100644
--- a/src/Mod/Part/Gui/DlgImportExportStep.ui
+++ b/src/Mod/Part/Gui/DlgImportExportStep.ui
@@ -13,13 +13,13 @@
   <property name="windowTitle">
    <string>STEP</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
+  <layout class="QGridLayout" name="gridLayout_4">
    <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_3">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -59,6 +59,32 @@
         </item>
        </widget>
       </item>
+      <item row="1" column="0" colspan="3">
+       <widget class="QGroupBox" name="groupBox_2">
+        <property name="title">
+         <string>Scheme</string>
+        </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QRadioButton" name="radioButtonAP203">
+           <property name="text">
+            <string notr="true">AP 203</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QRadioButton" name="radioButtonAP214">
+           <property name="text">
+            <string notr="true">AP 214</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -116,6 +142,14 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>comboBoxUnits</tabstop>
+  <tabstop>radioButtonAP203</tabstop>
+  <tabstop>radioButtonAP214</tabstop>
+  <tabstop>lineEditCompany</tabstop>
+  <tabstop>lineEditAuthor</tabstop>
+  <tabstop>lineEditProduct</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
index aef5c826e0..b32670170c 100644
--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
+++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp
@@ -201,6 +201,17 @@ void DlgImportExportStep::saveSettings()
             break;
     }
 
+    // scheme
+    if (ui->radioButtonAP203->isChecked()) {
+        Interface_Static::SetCVal("write.step.schema","AP203");
+        hGrp->GetASCII("Scheme", "AP203");
+    }
+    else {
+        // possible values: AP214CD (1996), AP214DIS (1998), AP214IS (2002)
+        Interface_Static::SetCVal("write.step.schema","AP214CD");
+        hGrp->GetASCII("Scheme", "AP214CD");
+    }
+
     // header info
     hGrp->SetASCII("Company", ui->lineEditCompany->text().toLatin1());
     hGrp->SetASCII("Author", ui->lineEditAuthor->text().toLatin1());
@@ -214,6 +225,14 @@ void DlgImportExportStep::loadSettings()
     int unit = hGrp->GetInt("Unit", 0);
     ui->comboBoxUnits->setCurrentIndex(unit);
 
+    // scheme
+    QString ap = QString::fromStdString(hGrp->GetASCII("Scheme", 
+        Interface_Static::CVal("write.step.schema")));
+    if (ap.startsWith(QLatin1String("AP203")))
+        ui->radioButtonAP203->setChecked(true);
+    else
+        ui->radioButtonAP214->setChecked(true);
+
     // header info
     ui->lineEditCompany->setText(QString::fromStdString(hGrp->GetASCII("Company")));
     ui->lineEditAuthor->setText(QString::fromStdString(hGrp->GetASCII("Author")));