diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
index 9e8d977f0..708550139 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcx.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>555</width>
-    <height>628</height>
+    <height>652</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -39,8 +39,40 @@
         </property>
         <item>
          <layout class="QGridLayout" name="gl_ccx">
-          <item row="0" column="2">
-           <widget class="Gui::PrefFileChooser" name="fc_ccx_binary" native="true">
+          <item row="5" column="2">
+           <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>ExternalEditorPath</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="l_ccx_binary_path">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>ccx binary path:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="2">
+           <widget class="Gui::PrefFileChooser" name="fc_ccx_binary_path" native="true">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -76,23 +108,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="l_ext_editor">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>100</width>
-              <height>0</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>External editor:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
+          <item row="3" column="2">
            <widget class="Gui::PrefCheckBox" name="cb_int_editor">
             <property name="text">
              <string>Use internal editor for .inp files</string>
@@ -108,28 +124,18 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
+          <item row="3" column="0">
            <widget class="QLabel" name="l_editor">
             <property name="text">
              <string>Editor</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
-           <widget class="Gui::PrefFileChooser" name="fc_ext_editor" native="true">
+          <item row="5" column="0">
+           <widget class="QLabel" name="l_ext_editor">
             <property name="enabled">
              <bool>false</bool>
             </property>
-            <property name="prefEntry" stdset="0">
-             <cstring>ExternalEditorPath</cstring>
-            </property>
-            <property name="prefPath" stdset="0">
-             <cstring>Mod/Fem/Ccx</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="l_ccx_binary">
             <property name="minimumSize">
              <size>
               <width>100</width>
@@ -137,7 +143,30 @@
              </size>
             </property>
             <property name="text">
-             <string>ccx binary</string>
+             <string>External editor:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="2">
+           <widget class="Gui::PrefCheckBox" name="cb_ccx_binary_std">
+            <property name="text">
+             <string>Use standard ccx binary path</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+            <property name="prefEntry" stdset="0">
+             <cstring>UseStandardCcxLocation</cstring>
+            </property>
+            <property name="prefPath" stdset="0">
+             <cstring>Mod/Fem/Ccx</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="l_ccx_binary_std">
+            <property name="text">
+             <string>CalculiX binary</string>
             </property>
            </widget>
           </item>
@@ -704,5 +733,69 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>cb_ccx_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_ccx_binary_path</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_ccx_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fc_ccx_binary_path</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>406</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_ccx_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>l_ccx_binary_path</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cb_ccx_binary_std</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fc_ccx_binary_path</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>406</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>406</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
index 0940cbf2a..0bf52e32e 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.cpp
@@ -1,7 +1,8 @@
 /***************************************************************************
  *   Copyright (c) 2015 FreeCAD Developers                                 *
  *   Author: Przemo Firszt <przemo@firszt.eu>                              *
- *   Based on src/Mod/Raytracing/Gui/DlgSettingsRayImp.cpp                 *
+ *   Author: Bernd Hahnebach <bernd@bimstatik.ch>                          *
+ *   Based on src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.cpp                 *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *
@@ -66,7 +67,8 @@ void DlgSettingsFemCcxImp::saveSettings()
 
     cb_int_editor->onSave();
     fc_ext_editor->onSave();
-    fc_ccx_binary->onSave();
+    cb_ccx_binary_std->onSave();
+    fc_ccx_binary_path->onSave();
 }
 
 void DlgSettingsFemCcxImp::loadSettings()
@@ -88,7 +90,8 @@ void DlgSettingsFemCcxImp::loadSettings()
 
     cb_int_editor->onRestore();
     fc_ext_editor->onRestore();
-    fc_ccx_binary->onRestore();
+    cb_ccx_binary_std->onRestore();
+    fc_ccx_binary_path->onRestore();
 
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
         ("User parameter:BaseApp/Preferences/Mod/Fem/Ccx");
diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h
index 71d1680fb..245c74e96 100644
--- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h
+++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h
@@ -1,7 +1,8 @@
  /**************************************************************************
  *   Copyright (c) 2015 FreeCAD Developers                                 *
  *   Author: Przemo Firszt <przemo@firszt.eu>                              *
- *   Based on src/Mod/Raytracing/Gui/DlgSettingsRayImp.h                   *
+ *   Author: Bernd Hahnebach <bernd@bimstatik.ch>                          *
+ *   Based on src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h                   *
  *                                                                         *
  *   This file is part of the FreeCAD CAx development system.              *
  *                                                                         *