diff --git a/Input/Joysticks/CH/pro-pedals-usb.xml b/Input/Joysticks/CH/pro-pedals-usb.xml
index 99d7fd1f3..8caa45497 100644
--- a/Input/Joysticks/CH/pro-pedals-usb.xml
+++ b/Input/Joysticks/CH/pro-pedals-usb.xml
@@ -21,6 +21,7 @@ $Id$
  <name>CH PRO PEDALS USB </name>
 
  <axis n="0">
+  <desc>Brake left</desc>
   <binding>
    <command>property-scale</command>
    <property>/controls/gear/brake-left</property>
@@ -30,6 +31,7 @@ $Id$
  </axis>
 
  <axis n="1">
+  <desc>Brake right</desc>
   <binding>
    <command>property-scale</command>
    <property>/controls/gear/brake-right</property>
@@ -39,6 +41,7 @@ $Id$
  </axis>
 
  <axis n="2">
+  <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/rudder</property>
diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
index 2821b1e14..3fb5f8705 100644
--- a/Input/Joysticks/CH/pro-yoke-usb.xml
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -52,6 +52,7 @@
    <factor type="double">-0.5</factor>
   </binding>
  </axis>
+
  <axis>
   <desc>Propeller</desc>
   <number>
@@ -99,12 +100,12 @@
  </axis>
 
  <axis>
+  <desc>View Elevation</desc>
   <number>
     <unix>6</unix>
     <mac>6</mac>
     <windows>7</windows>
   </number>
-  <desc>View Elevation</desc>
   <low>
    <repeatable>true</repeatable>
    <binding>
@@ -124,7 +125,7 @@
  </axis>
 
  <button n="0">
-<desc>Fire Starter on Selected Engine(s)</desc>
+  <desc>Fire Starter on Selected Engine(s)</desc>
   <binding>
    <command>nasal</command>
    <script>controls.startEngine()</script>
@@ -137,7 +138,8 @@
   </mod-up> 
  </button>
 
-<button n="1">
+ <button n="1">
+  <desc>Cycle View</desc>
   <repeatable>false</repeatable>
   <binding>
    <command>view-cycle</command>
@@ -145,6 +147,7 @@
  </button>
 
  <button n="2">
+  <desc>Rudder Trim Right</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -154,6 +157,7 @@
  </button>
 
  <button n="3">
+  <desc>Rudder Trim Left</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -193,6 +197,7 @@
  </button>
 
  <button n="6">
+  <desc>Flaps up</desc>
   <repeatable>false</repeatable>
   <binding>
    <command>nasal</command>
@@ -207,6 +212,7 @@
  </button>
 
  <button n="7">
+  <desc>Flaps down</desc>
   <repeatable>false</repeatable>
   <binding>
    <command>nasal</command>
@@ -221,6 +227,7 @@
  </button>
 
  <button n="8">
+  <desc>Increase Engine Boost</desc>
   <repeatable>true</repeatable>
    <binding>
     <command>property-adjust</command>
@@ -235,6 +242,7 @@
  </button>
 
  <button n="9">
+  <desc>Decrease Engine Boost</desc>
   <repeatable>true</repeatable>
    <binding>
     <command>property-adjust</command>
@@ -248,7 +256,8 @@
    </binding>
  </button>
 
-  <button n="10">
+ <button n="10">
+  <desc>Elevator Trim down</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -258,6 +267,7 @@
  </button>
 
  <button n="11">
+  <desc>Elevator Trim up</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
diff --git a/Input/Joysticks/Default/four-axis-joystick.xml b/Input/Joysticks/Default/four-axis-joystick.xml
index 30cb841b9..6e8fe49b9 100644
--- a/Input/Joysticks/Default/four-axis-joystick.xml
+++ b/Input/Joysticks/Default/four-axis-joystick.xml
@@ -41,6 +41,7 @@ joystick, and that the first button is the trigger.
  </axis>
 
  <axis n="3">
+  <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/rudder</property>
diff --git a/Input/Joysticks/Logitech/wingman-force.xml b/Input/Joysticks/Logitech/wingman-force.xml
index c429f979c..cb26a58d6 100644
--- a/Input/Joysticks/Logitech/wingman-force.xml
+++ b/Input/Joysticks/Logitech/wingman-force.xml
@@ -101,6 +101,7 @@ $Id$
  <!-- The next two axes are the view hat -->
 
  <axis n="3">
+  <desc>View left/right</desc>
   <binding>
    <command>property-scale</command>
    <property>/sim/current-view/axes/lat</property>
@@ -108,6 +109,7 @@ $Id$
  </axis>
 
  <axis n="4">
+  <desc>View up/down</desc>
   <binding>
    <command>property-scale</command>
    <property>/sim/current-view/axes/long</property>
@@ -129,6 +131,7 @@ $Id$
  </button>
 
  <button n="2">
+  <desc>Elevator trim down</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -138,6 +141,7 @@ $Id$
  </button>
 
  <button n="3">
+  <desc>Elevator trim up</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -147,6 +151,7 @@ $Id$
  </button>
 
  <button n="4">
+  <desc>Mixture richer</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -161,6 +166,7 @@ $Id$
  </button>
 
  <button n="5">
+  <desc>Mixture leaner</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
diff --git a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
index 183118416..ac485d9ae 100644
--- a/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
+++ b/Input/Joysticks/Logitech/wingman-rumblepad-usb.xml
@@ -65,6 +65,7 @@ $Id$
  </axis>
 
  <axis n="3">
+  <desc>Rudder</desc>
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/rudder</property>
@@ -73,10 +74,14 @@ $Id$
  </axis>
 
  <axis n="4">
-  <command>null</command>
+  <desc>unused</desc>
+  <binding>
+   <command>null</command>
+  </binding>
  </axis>
 
  <axis n="5">
+  <desc>View left/right</desc>
   <binding>
    <command>property-scale</command>
    <property>/sim/current-view/axes/lat</property>
@@ -84,6 +89,7 @@ $Id$
  </axis>
 
  <axis n="6">
+  <desc>View up/down</desc>
   <binding>
    <command>property-scale</command>
    <property>/sim/current-view/axes/long</property>
@@ -91,6 +97,7 @@ $Id$
  </axis>
 
  <button n="0">
+  <desc>Elevator trim up</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -100,6 +107,7 @@ $Id$
  </button>
 
  <button n="1">
+  <desc>Decrease propeller pitch</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -114,6 +122,7 @@ $Id$
  </button>
 
  <button n="2">
+  <desc>Mixture leaner</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -128,6 +137,7 @@ $Id$
  </button>
 
  <button n="3">
+  <desc>Elevator trim down</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -137,6 +147,7 @@ $Id$
  </button>
 
  <button n="4">
+  <desc>Increase propeller pitch</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -151,6 +162,7 @@ $Id$
  </button>
 
  <button n="5">
+  <desc>Mixture richer</desc>
   <repeatable>true</repeatable>
   <binding>
    <command>property-adjust</command>
@@ -193,6 +205,7 @@ $Id$
  </button>
 
  <button n="8">
+  <desc>Cycle View</desc>
   <repeatable>false</repeatable>
   <binding>
    <command>view-cycle</command>