diff --git a/Input/Joysticks/CH/pro-pedals-usb.xml b/Input/Joysticks/CH/pro-pedals-usb.xml
new file mode 100644
index 000000000..8e23fb671
--- /dev/null
+++ b/Input/Joysticks/CH/pro-pedals-usb.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+* Setup for CH Pro Pedals USB.
+*
+* These are USB rudder pedals with toe brakes.  Bindings are as
+* follow:
+*
+* Axis 0 (left pedal): left brake
+* Axis 1 (right pedal): right brake
+* Axis 2 (sliding both pedals): rudder (and nosewheel)
+************************************************************************
+-->
+
+<PropertyList>
+
+ <name>CH PRODUCTS CH PRO PEDALS USB </name>
+
+ <axis n="0">
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/brakes[0]</property>
+   <offset>1.0</offset>
+   <factor>0.5</factor>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <axis n="1">
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/brakes[1]</property>
+   <offset>1.0</offset>
+   <factor>0.5</factor>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <axis n="2">
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/rudder</property>
+   <factor>1.0</factor>
+   <offset>0.0</offset>
+   <squared>true</squared>
+  </binding>
+ </axis>
+
+</PropertyList>
diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
new file mode 100644
index 000000000..d98ad1760
--- /dev/null
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+* Setup for CH Pro Yoke USB.
+*
+* This is a USB yoke with three throttle levers.  Bindings are as
+* follow:
+*
+* Axis 0: ailerons
+* Axis 1: elevator
+* Axis 2 (left lever): throttle
+* Axis 3 (right lever): mixture
+* Axis 4 (middle lever): propeller pitch/RPM
+* Axes 5 and 6 (hat): set view direction
+*
+* Button 0 (left trigger): [not yet bound]
+* Button 1 (right trigger): cycle view
+* Buttons 2 and 3 (right rocker): rudder trim
+* Buttons 4 and 5 (left toggle): gear up/down
+* Buttons 6 and 7 (right toggle): flaps up/down
+* Button 8 (top red button): [not yet bound]
+* Button 9 (bottom red button): [not yet bound]
+* Buttons 10 and 11 (left rocker): elevator trim
+************************************************************************
+-->
+
+<PropertyList>
+
+ <name>CH PRODUCTS CH FLIGHT SIM YOKE USB </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">
+  <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>
+   <squared>false</squared>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/throttle[1]</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <axis n="3">
+  <desc>Mixture</desc>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/mixture[0]</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+   <squared>false</squared>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/mixture[1]</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <axis n="4">
+  <desc>Propeller</desc>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/propeller-pitch[0]</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+   <squared>false</squared>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/propeller-pitch[1]</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <axis n="5">
+  <binding>
+   <command>property-scale</command>
+   <property>/sim/current-view/axes/lat</property>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <axis n="6">
+  <binding>
+   <command>property-scale</command>
+   <property>/sim/current-view/axes/long</property>
+   <squared>false</squared>
+  </binding>
+ </axis>
+
+ <button n="1">
+  <repeatable>false</repeatable>
+  <binding>
+   <command>view-cycle</command>
+  </binding>
+ </button>
+
+ <button n="2">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/rudder-trim</property>
+   <step>0.001</step>
+  </binding>
+ </button>
+
+ <button n="3">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/rudder-trim</property>
+   <step>-0.001</step>
+  </binding>
+ </button>
+
+ <button n="4">
+  <repeatable>false</repeatable>
+  <binding>
+   <command>property-assign</command>
+   <property>/controls/gear-down</property>
+   <value>false</value>
+  </binding>
+ </button>
+
+ <button n="5">
+  <repeatable>false</repeatable>
+  <binding>
+   <command>property-assign</command>
+   <property>/controls/gear-down</property>
+   <value>true</value>
+  </binding>
+ </button>
+
+ <button n="6">
+  <repeatable>false</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/flaps</property>
+   <step type="double">-0.34</step>
+  </binding>
+ </button>
+
+ <button n="7">
+  <repeatable>false</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/flaps</property>
+   <step type="double">0.34</step>
+  </binding>
+ </button>
+
+ <button n="10">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/elevator-trim</property>
+   <step>0.001</step>
+  </binding>
+ </button>
+
+ <button n="11">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/elevator-trim</property>
+   <step>-0.001</step>
+  </binding>
+ </button>
+
+</PropertyList>
+
diff --git a/Input/Joysticks/Default/joystick.xml b/Input/Joysticks/Default/joystick.xml
new file mode 100644
index 000000000..54b3f7a70
--- /dev/null
+++ b/Input/Joysticks/Default/joystick.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+
+<!-- 
+************************************************************************
+Default joystick bindings.
+
+Assume that we have a conventional, three-axis, three-button
+joystick, and that the first button is the trigger.
+************************************************************************
+-->
+
+<PropertyList>
+
+ <axis n="0">
+  <desc>Aileron</desc>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/aileron</property>
+   <squared type="bool">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 type="bool">true</squared>
+  </binding>
+ </axis>
+
+ <axis n="2">
+  <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>
+
+ <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="1">
+  <desc>Elevator trim up</desc>
+  <repeatable type="bool">true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/elevator-trim</property>
+   <step type="double">0.001</step>
+  </binding>
+ </button>
+
+ <button n="2">
+  <desc>Elevator trim down</desc>
+  <repeatable type="bool">true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/elevator-trim</property>
+   <step type="double">-0.001</step>
+  </binding>
+ </button>
+
+</PropertyList>
+
+<!-- end of joystick.xml -->
diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
new file mode 100644
index 000000000..8b6e61cc4
--- /dev/null
+++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+* Bindings for Logitech WingMan Digital Extreme 3D joystick.
+*
+* This joystick is dual-mode: it can connect either through the
+* 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 5 and 6 (hat): view direction
+*
+* Button 0 (trigger): all brakes
+* 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
+************************************************************************
+-->
+
+<PropertyList>
+
+ <name>Logitech Inc. WingMan Extreme Digital 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="1">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/elevator-trim</property>
+   <step>0.001</step>
+  </binding>
+ </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/mixture[0]</property>
+   <property>/controls/mixture[1]</property>
+   <step>0.01</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">
+  <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="6">
+  <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>
+
+</PropertyList>
diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
new file mode 100644
index 000000000..5f21d7e6a
--- /dev/null
+++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0"?>
+
+<!--
+************************************************************************
+* Setup for Logitech WingMan Rumblepad gamepad.
+*
+* This is a USB gamepad with some feedback capability (not supported
+* by plib or by most OS's).  Bindings are as follow:
+*
+* Axis 0 (left joystick): ailerons
+* Axis 1 (left joystick): elevator
+* Axis 2 (slider): throttle
+* Axis 3 (right joystick): rudder
+* Axis 4 (right joystick): raise/lower 2D panel
+* Axes 5 and 6 (hat): set view direction
+*
+* Button 0 (A): elevator trim up
+* Button 1 (B): decrease propeller pitch
+* Button 2 (C): mixture leaner
+* Button 3 (X): elevator trim down
+* Button 4 (Y): increase propeller pitch
+* Button 5 (Z): mixture richer
+* Button 6 (left trigger): left wheel brake
+* Button 7 (right trigger): right wheel brake
+* Button 8 (S): cycle view
+************************************************************************
+-->
+
+<PropertyList>
+
+ <name>Logitech Inc. WingMan RumblePad</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">
+  <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>
+
+ <axis n="3">
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/rudder</property>
+   <factor>1.0</factor>
+   <offset>0.0</offset>
+   <squared>true</squared>
+  </binding>
+ </axis>
+
+ <axis n="4">
+  <binding>
+   <command>null</command>
+  </binding>
+  <low>
+   <repeatable>true</repeatable>
+   <binding>
+    <command>property-adjust</command>
+    <property>/sim/panel/y-offset</property>
+    <step>5</step>
+   </binding>
+  </low>
+  <high>
+   <repeatable>true</repeatable>
+   <binding>
+    <command>property-adjust</command>
+    <property>/sim/panel/y-offset</property>
+    <step>-5</step>
+   </binding>
+  </high>
+ </axis>
+
+ <axis n="5">
+  <binding>
+   <command>property-scale</command>
+   <property>/sim/current-view/axes/lat</property>
+  </binding>
+ </axis>
+
+ <axis n="6">
+  <binding>
+   <command>property-scale</command>
+   <property>/sim/current-view/axes/long</property>
+  </binding>
+ </axis>
+
+ <button n="0">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/elevator-trim</property>
+   <step>-0.001</step>
+  </binding>
+  <binding>
+   <command>null</command>
+  </binding>
+  <binding>
+   <command>null</command>
+  </binding>
+ </button>
+
+ <button n="1">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/propeller-pitch[0]</property>
+   <step>-0.01</step>
+  </binding>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/propeller-pitch[1]</property>
+   <step>-0.01</step>
+  </binding>
+ </button>
+
+ <button n="2">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/mixture[0]</property>
+   <step>-0.01</step>
+  </binding>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/mixture[1]</property>
+   <step>-0.01</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/propeller-pitch[0]</property>
+   <step>0.01</step>
+  </binding>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/propeller-pitch[1]</property>
+   <step>0.01</step>
+  </binding>
+ </button>
+
+ <button n="5">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/mixture[0]</property>
+   <step>0.01</step>
+  </binding>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/mixture[1]</property>
+   <step>0.01</step>
+  </binding>
+ </button>
+
+ <button n="6">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/brakes[0]</property>
+   <step>0.1</step>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>property-assign</command>
+    <property>/controls/brakes[0]</property>
+    <value>0.0</value>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="7">
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>/controls/brakes[1]</property>
+   <step>0.1</step>
+  </binding>
+  <mod-up>
+   <binding>
+    <command>property-assign</command>
+    <property>/controls/brakes[1]</property>
+    <value>0.0</value>
+   </binding>
+  </mod-up>
+ </button>
+
+ <button n="8">
+  <repeatable>false</repeatable>
+  <binding>
+   <command>view-cycle</command>
+  </binding>
+ </button>
+
+</PropertyList>
+
+<!-- end of "rumblepad.fgd" -->