diff --git a/Aircraft/c172p/c172p-jsbsim-set.xml b/Aircraft/c172p/c172p-2dpanel-set.xml
similarity index 82%
rename from Aircraft/c172p/c172p-jsbsim-set.xml
rename to Aircraft/c172p/c172p-2dpanel-set.xml
index 860291cef..21690e882 100644
--- a/Aircraft/c172p/c172p-jsbsim-set.xml
+++ b/Aircraft/c172p/c172p-2dpanel-set.xml
@@ -7,11 +7,11 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
 ************************************************************************
 -->
 
-<PropertyList include="c172p-jsbsim-base.xml">
+<PropertyList include="c172p-set.xml">
 
  <sim>
 
-  <description>Cessna 172P (JSBSim, 2D panel).</description>
+  <description>Cessna 172P Skyhawk (1981 model), 2D panel</description>
 
   <!-- Use a 2D instrument panel -->
  
@@ -26,6 +26,7 @@ Started October 23 2001 by John Check, fgpanels@rockfish.net
   <!-- Look down a bit over the top of the panel -->
 
   <view>
+   <internal archive="y">false</internal>
    <config>
      <pitch-offset-deg>-8</pitch-offset-deg>
    </config>
diff --git a/Aircraft/c172p/c172p-3d-jsbsim-set.xml b/Aircraft/c172p/c172p-3d-jsbsim-set.xml
deleted file mode 100644
index fe227d1ce..000000000
--- a/Aircraft/c172p/c172p-3d-jsbsim-set.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!--
-************************************************************************
-JSBSim Cessna 172P with 3D cockpit.
-
-Started October 23 2001 by John Check, fgpanels@rockfish.net
-************************************************************************
--->
-
-<PropertyList include="c172p-jsbsim-base.xml">
-
- <sim>
-
-  <description>Cessna 172P (JSBSim, 3D cockpit)</description>
-
-  <!-- hide the 2D panel -->
- 
-  <panel>
-   <visibility archive="y">false</visibility>
-  </panel>
-
-  <!-- position the pilot viewpoint and angle -->
- 
-  <view>
-   <internal archive="y">true</internal>
-   <config>
-     <x-offset-m archive="y">-0.18</x-offset-m>
-     <y-offset-m archive="y">0.30</y-offset-m>
-     <z-offset-m archive="y">0.36</z-offset-m>
-     <pitch-offset-deg>-12</pitch-offset-deg>
-   </config>
-  </view>
-
-
- </sim>
-  
-</PropertyList>
diff --git a/Aircraft/c172p/c172p-3d-set.xml b/Aircraft/c172p/c172p-3d-set.xml
deleted file mode 100644
index fc820a0b7..000000000
--- a/Aircraft/c172p/c172p-3d-set.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-
-<PropertyList include="c172p-3d-jsbsim-set.xml">
- <sim>
-  <description>Alias for c172p-3d-jsbsim.</description>
- </sim>
-</PropertyList>
diff --git a/Aircraft/c172p/c172p-base.xml b/Aircraft/c172p/c172p-base.xml
deleted file mode 100644
index 7169736d9..000000000
--- a/Aircraft/c172p/c172p-base.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-************************************************************************
-Common configuration for all C172P aircraft.
-************************************************************************
--->
-
-<PropertyList include="../c172/c172-base.xml">
-
- <sim>
-
-  <model>
-   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
-  </model>
-
- </sim>
-
- <autopilot>
-   <config>
-     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
-     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
-     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
-     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
-     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
-     <integral-contribution type="float">0.01</integral-contribution>
-     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
-     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
-   </config>
- </autopilot>
-
- <consumables>
-  <fuel>
-   <tank n="0">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-   <tank n="1">
-    <level-gal_us>20</level-gal_us>
-   </tank>
-  </fuel>
- </consumables>
-
-</PropertyList>
diff --git a/Aircraft/c172p/c172p-jsbsim-base.xml b/Aircraft/c172p/c172p-jsbsim-base.xml
deleted file mode 100644
index ad8e57383..000000000
--- a/Aircraft/c172p/c172p-jsbsim-base.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!--
-************************************************************************
-Common configuration for JSBSim C172P aircraft.
-************************************************************************
--->
-
-<PropertyList include="c172p-base.xml">
-
- <sim>
-  <flight-model archive="y">jsb</flight-model>
-  <aero archive="y">c172p</aero>
- </sim>
-
- <!-- trim for level cruise -->
-
- <controls>
-  <flight>
-   <aileron-trim>0.027</aileron-trim>
-   <rudder-trim>0.0</rudder-trim>
-  </flight>
- </controls>
-
-</PropertyList>
diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml
index 95cf781a0..defba55b0 100644
--- a/Aircraft/c172p/c172p-set.xml
+++ b/Aircraft/c172p/c172p-set.xml
@@ -1,7 +1,109 @@
 <?xml version="1.0"?>
+<!--
+************************************************************************
+JSBSim Cessna 172P with 3D cockpit.
+
+Started October 23 2001 by John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
 
-<PropertyList include="c172p-jsbsim-set.xml">
  <sim>
-  <description>Alias for c172p-jsbsim.</description>
+
+  <description>Cessna 172P Skyhawk (1981 model)</description>
+
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172p</aero>
+
+  <model>
+   <path archive="y">Aircraft/c172p/Models/c172p.xml</path>
+  </model>
+
+  <!-- hide the 2D panel -->
+ 
+  <panel>
+   <visibility archive="y">false</visibility>
+  </panel>
+
+  <!-- position the pilot viewpoint and angle -->
+ 
+  <view>
+   <internal archive="y">true</internal>
+   <config>
+     <x-offset-m archive="y">-0.18</x-offset-m>
+     <y-offset-m archive="y">0.30</y-offset-m>
+     <z-offset-m archive="y">0.36</z-offset-m>
+     <pitch-offset-deg>-12</pitch-offset-deg>
+   </config>
+  </view>
+
+  <systems>
+    <autopilot>
+      <path>Aircraft/Generic/generic-autopilot.xml</path>
+    </autopilot>
+    <electrical>
+      <path>Aircraft/c172/c172-electrical.xml</path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <audible archive="y">true</audible>
+   <path archive="y">Aircraft/c172/c172-sound.xml</path>
+  </sound>
+
  </sim>
+  
+ <!-- trim for level cruise -->
+
+ <controls>
+  <flight>
+   <aileron-trim>0.027</aileron-trim>
+   <rudder-trim>0.0</rudder-trim>
+  </flight>
+  <engines>
+   <engine n="0">
+    <magnetos>3</magnetos>
+   </engine>
+  </engines>
+ </controls>
+
+ <autopilot>
+   <config>
+     <min-climb-speed-kt type="float">70.0</min-climb-speed-kt>
+     <best-climb-speed-kt type="float">75.0</best-climb-speed-kt>
+     <target-climb-rate-fpm type="float">500.0</target-climb-rate-fpm>
+     <target-descent-rate-fpm type="float">1000.0</target-descent-rate-fpm>
+     <elevator-adj-factor type="float">4000.0</elevator-adj-factor>
+     <integral-contribution type="float">0.01</integral-contribution>
+     <zero-pitch-throttle type="float">0.45</zero-pitch-throttle>
+     <zero-pitch-trim-full-throttle type="float">0.14</zero-pitch-trim-full-throttle>
+   </config>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+   <tank n="1">
+    <level-gal_us>20</level-gal_us>
+   </tank>
+  </fuel>
+ </consumables>
+
+ <instrumentation>
+  <attitude-indicator>
+   <config>
+    <tumble-flag archive="y" type="bool">true</tumble-flag>
+   </config>
+  </attitude-indicator>
+ </instrumentation>
+  
+ <engines>
+  <engine>
+   <rpm type="double">700</rpm>
+  </engine>
+ </engines>
+  
 </PropertyList>