diff --git a/Input/Joysticks/Default/four-axis-joystick.xml b/Input/Joysticks/Default/four-axis-joystick.xml
index 41ea862e4..86f76e930 100644
--- a/Input/Joysticks/Default/four-axis-joystick.xml
+++ b/Input/Joysticks/Default/four-axis-joystick.xml
@@ -17,8 +17,8 @@ joystick, and that the first button is the trigger.
   <desc>Aileron</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/aileron</property>
-   <squared type="bool">true</squared>
+   <property>/controls/flight/aileron</property>
+   <power type="double">2</power>
   </binding>
  </axis>
 
@@ -26,9 +26,9 @@ joystick, and that the first button is the trigger.
   <desc>Elevator</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/elevator</property>
+   <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
-   <squared type="bool">true</squared>
+   <power type="double">2</power>
   </binding>
  </axis>
 
@@ -36,13 +36,49 @@ joystick, and that the first button is the trigger.
   <desc>Throttle</desc>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[0]</property>
+   <property>/controls/engines/engine[0]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
   <binding>
    <command>property-scale</command>
-   <property>/controls/throttle[1]</property>
+   <property>/controls/engines/engine[1]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[2]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[3]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[4]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[5]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[6]/throttle</property>
+   <offset type="double">-1.0</offset>
+   <factor type="double">-0.5</factor>
+  </binding>
+  <binding>
+   <command>property-scale</command>
+   <property>/controls/engines/engine[7]/throttle</property>
    <offset type="double">-1.0</offset>
    <factor type="double">-0.5</factor>
   </binding>
@@ -51,8 +87,8 @@ joystick, and that the first button is the trigger.
  <axis n="3">
   <binding>
    <command>property-scale</command>
-   <property>/controls/rudder</property>
-   <squared>true</squared>
+   <property>/controls/flight/rudder</property>
+   <power type="double">2</power>
   </binding>
  </axis>
 
@@ -60,33 +96,33 @@ joystick, and that the first button is the trigger.
   <desc>Brakes</desc>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[0]</property>
+   <property>/controls/gear/wheel[0]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[1]</property>
+   <property>/controls/gear/wheel[1]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <binding>
    <command>property-assign</command>
-   <property>/controls/brakes[2]</property>
+   <property>/controls/gear/wheel[2]/brake</property>
    <value type="double">1.0</value>
   </binding>
   <mod-up>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[0]</property>
+    <property>/controls/gear/wheel[0]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[1]</property>
+    <property>/controls/gear/wheel[1]/brake</property>
     <value type="double">0.0</value>
    </binding>
    <binding>
     <command>property-assign</command>
-    <property>/controls/brakes[2]</property>
+    <property>/controls/gear/wheel[2]/brake</property>
     <value type="double">0.0</value>
    </binding>
   </mod-up>
@@ -97,7 +133,7 @@ joystick, and that the first button is the trigger.
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">0.001</step>
   </binding>
  </button>
@@ -107,7 +143,7 @@ joystick, and that the first button is the trigger.
   <repeatable type="bool">true</repeatable>
   <binding>
    <command>property-adjust</command>
-   <property>/controls/elevator-trim</property>
+   <property>/controls/flight/elevator-trim</property>
    <step type="double">-0.001</step>
   </binding>
  </button>
diff --git a/Input/Joysticks/Saitek/X8-30.xml b/Input/Joysticks/Saitek/X8-30.xml
index 045b96d94..fa407a253 100644
--- a/Input/Joysticks/Saitek/X8-30.xml
+++ b/Input/Joysticks/Saitek/X8-30.xml
@@ -33,7 +33,7 @@ $Id$
   <binding>
    <command>property-scale</command>
    <property>/controls/flight/aileron</property>
-   <power type="bool">3</power>
+   <power type="double">3</power>
   </binding>
  </axis>
 
@@ -43,7 +43,7 @@ $Id$
    <command>property-scale</command>
    <property>/controls/flight/elevator</property>
    <factor type="double">-1.0</factor>
-   <power type="bool">3</power>
+   <power type="double">3</power>
   </binding>
  </axis>