diff --git a/Input/Joysticks/Logitech/wingman-force-3d.xml b/Input/Joysticks/Logitech/wingman-force-3d.xml
index 3b7e04701..2e7930fde 100644
--- a/Input/Joysticks/Logitech/wingman-force-3d.xml
+++ b/Input/Joysticks/Logitech/wingman-force-3d.xml
@@ -2,192 +2,205 @@
 
 <!--
 ************************************************************************
-* Bindings for Logitech WingMan Force 3D joystick.
+* Bindings for Logitech WingMan Digital Extreme 3D joystick.
 *
 * This joystick is dual-mode: it can connect either through the
-* serial or through a USB port.  Bindings are as follow:
+* gameport or through a USB port.  Bindings are as follow:
 *
 * Axis 0: ailerons
 * Axis 1: elevator
 * Axis 2 (twist): rudder
 * Axis 3 (slider): throttle
-* Axes 4 and 5 (hat): view direction
+* Axes 5 and 6 (hat): view direction
 *
 * Button 0 (trigger): all brakes
-* Button 2 (02): elevator trim up
-* Button 3 (03): elevator trim down
-* Button 4 (04): mixture richer
-* Button 5 (05): mixture leaner
-* Button 6 (06): left brake only
-* Button 7 (07): right brake only
+* Button 1 (02): elevator trim up
+* Button 2 (03): elevator trim down
+* Button 3 (04): mixture richer
+* Button 4 (05): mixture leaner
+* Button 5 (06): left brake only
+* Button 6 (07): right brake only
 ************************************************************************
+$Id$
 -->
 
 <PropertyList>
 
- <name>Logitech Inc. WingMan Force 3D</name>
-
- <axis n="0">
-  <desc>Aileron</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/aileron</property>
-   <squared>true</squared>
-  </binding>
- </axis>
-
- <axis n="1">
-  <desc>Elevator</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/elevator</property>
-   <factor type="double">-1.0</factor>
-   <squared>true</squared>
-  </binding>
- </axis>
-
- <axis n="2">
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/rudder</property>
-   <squared>true</squared>
-  </binding>
- </axis>
-
- <axis n="3">
-  <desc>Throttle</desc>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
-  <binding>
-   <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
-   <offset type="double">-1.0</offset>
-   <factor type="double">-0.5</factor>
-  </binding>
- </axis>
-
- <!-- The next two axes are the view hat -->
-
- <axis n="4">
-  <binding>
-   <command>property-scale</command>
-   <property>/sim/current-view/axes/lat</property>
-  </binding>
- </axis>
-
- <axis n="5">
-  <binding>
-   <command>property-scale</command>
-   <property>/sim/current-view/axes/long</property>
-  </binding>
- </axis>
-
- <button n="0">
-  <desc>Brakes</desc>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
-   <value type="double">1.0</value>
-  </binding>
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
-   <value type="double">1.0</value>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
-    <value type="double">0.0</value>
-   </binding>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
-    <value type="double">0.0</value>
-   </binding>
-  </mod-up>
- </button>
-
- <button n="2">
-  <repeatable>true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
-   <step>0.001</step>
-  </binding>
- </button>
-
- <button n="3">
-  <repeatable>true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
-   <step>-0.001</step>
-  </binding>
- </button>
-
- <button n="4">
-  <repeatable>true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
-   <property>/controls/mixture[1]</property>
-   <step>0.01</step>
-  </binding>
- </button>
-
- <button n="5">
-  <repeatable>true</repeatable>
-  <binding>
-   <command>property-adjust</command>
-   <property>/controls/mixture[0]</property>
-   <property>/controls/mixture[1]</property>
-   <step>-0.01</step>
-  </binding>
- </button>
-
- <button n="6">
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
-   <value type="double">1.0</value>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
-    <value type="double">0.0</value>
-   </binding>
-  </mod-up>
- </button>
-
- <button n="7">
-  <binding>
-   <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
-   <value type="double">1.0</value>
-  </binding>
-  <mod-up>
-   <binding>
-    <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
-    <value type="double">0.0</value>
-   </binding>
-  </mod-up>
- </button>
+	<name>Logitech Inc. WingMan Force 3D</name>
+	
+	<axis n="0">
+		<desc>Aileron</desc>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/flight/aileron</property>
+			<squared>true</squared>
+			<factor type="double">5.0</factor>
+		</binding>
+	</axis>
+	
+	<axis n="1">
+		<desc>Elevator</desc>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/flight/elevator</property>
+			<factor type="double">-5.0</factor>
+			<squared>true</squared>
+		</binding>
+	</axis>
+	
+	<axis n="2">
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/flight/rudder</property>
+			<factor type="double">3.0</factor>
+			<squared>true</squared>
+		</binding>
+	</axis>
+	
+	<axis n="3">
+		<desc>Throttle</desc>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/engines/engine[0]/throttle</property>
+			<offset type="double">-.3</offset>
+			<factor type="double">-1.0</factor>
+		</binding>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/engines/engine[1]/throttle</property>
+			<offset type="double">-.3</offset>
+			<factor type="double">-1.0</factor>
+		</binding>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/engines/engine[2]/throttle</property>
+			<offset type="double">-.3</offset>
+			<factor type="double">-1.0</factor>
+		</binding>
+		<binding>
+			<command>property-scale</command>
+			<property>/controls/engines/engine[3]/throttle</property>
+			<offset type="double">-.3</offset>
+			<factor type="double">-1.0</factor>
+		</binding>
+	</axis>
+	
+	<!-- The next two axes are the view hat -->
+	
+	<axis n="4">
+		<binding>
+			<command>property-scale</command>
+			<property>/sim/current-view/axes/lat</property>
+		</binding>
+	</axis>
+	
+	<axis n="5">
+		<binding>
+			<command>property-scale</command>
+			<property>/sim/current-view/axes/long</property>
+		</binding>
+	</axis>
+	
+	<button n="0">
+	<desc>Brakes</desc>
+		<binding>
+			<command>property-assign</command>
+			<property>/controls/gear/brake-left</property>
+			<value type="double">1.0</value>
+		</binding>
+		<binding>
+			<command>property-assign</command>
+			<property>/controls/gear/brake-right</property>
+			<value type="double">1.0</value>
+		</binding>
+		<mod-up>
+			<binding>
+			<command>property-assign</command>
+			<property>/controls/gear/brake-left</property>
+			<value type="double">0.0</value>
+			</binding>
+			<binding>
+			<command>property-assign</command>
+			<property>/controls/gear/brake-right</property>
+			<value type="double">0.0</value>
+			</binding>
+		</mod-up>
+	</button>
+	
+	<button n="1">
+	<repeatable>true</repeatable>
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/flight/elevator-trim</property>
+		<step>0.005</step>
+	</binding>
+	</button>
+	
+	<button n="2">
+	<repeatable>true</repeatable>
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/flight/elevator-trim</property>
+		<step>-0.005</step>
+	</binding>
+	</button>
+	
+	<button n="3">
+	<repeatable>true</repeatable>
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/engines/engine[0]/mixture</property>
+		<step>0.01</step>
+	</binding>
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/engines/engine[1]/mixture</property>
+		<step>0.01</step>
+	</binding>
+	</button>
+	
+	<button n="4">
+	<repeatable>true</repeatable>
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/engines/engine[0]/mixture</property>
+		<step>-0.01</step>
+	</binding>
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/engines/engine[1]/mixture</property>
+		<step>-0.01</step>
+	</binding>
+	</button>
+	
+	<button n="5">
+	<binding>
+		<command>property-adjust</command>
+		<property>/controls/gear/brake-left</property>
+		<value type="double">1.0</value>
+		<mod-up>
+			<binding>
+				<command>property-adjust</command>
+				<property>/controls/gear/brake-left</property>
+				<value type="double">0.0</value>
+			</binding>
+		</mod-up>
+	</binding>
+	</button>
+	
+	<button n="6">
+		<binding>
+			<command>property-adjust</command>
+			<property>/controls/gear/brake-right</property>
+			<value type="double">1.0</value>
+		</binding>
+		<mod-up>
+			<binding>
+				<command>property-adjust</command>
+				<property>/controls/gear/brake-right</property>
+				<value type="double">0.0</value>
+			</binding>
+		</mod-up>
+	</button>
 
 </PropertyList>