diff --git a/Input/Joysticks/CH/pro-yoke-usb.xml b/Input/Joysticks/CH/pro-yoke-usb.xml
index e8608438a..d3ba87c7d 100644
--- a/Input/Joysticks/CH/pro-yoke-usb.xml
+++ b/Input/Joysticks/CH/pro-yoke-usb.xml
@@ -79,6 +79,7 @@
   <desc>Mixture</desc>
   <number>
     <unix>3</unix>
+    <mac>3</mac>
     <windows>4</windows>
   </number>
   <binding>
@@ -98,6 +99,7 @@
   <desc>Propeller</desc>
   <number>
     <unix>4</unix>
+    <mac>3</mac>
     <windows>3</windows>
   </number>
   <binding>
@@ -118,6 +120,7 @@
   <desc>View Direction</desc>
   <number>
     <unix>5</unix>
+    <mac>5</mac>
     <windows>6</windows>
   </number>
   <low>
@@ -141,6 +144,7 @@
  <axis>
   <number>
     <unix>6</unix>
+    <mac>6</mac>
     <windows>7</windows>
   </number>
   <desc>View Elevation</desc>
diff --git a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
index 36d6aa80d..e6cc97c12 100644
--- a/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
+++ b/Input/Joysticks/Logitech/wingman-extreme-digital-3d-win.xml
@@ -30,6 +30,7 @@ $Id$
   <desc>Aileron</desc>
   <number>
    <unix>0</unix>
+   <mac>0</mac>
    <windows>0</windows>
   </number>
   <binding>
@@ -43,6 +44,7 @@ $Id$
   <desc>Elevator</desc>
   <number>
    <unix>1</unix>
+   <mac>1</mac>
    <windows>1</windows>
   </number>
   <binding>
@@ -57,6 +59,7 @@ $Id$
   <desc>Throttle</desc>
   <number>
    <unix>3</unix>
+   <mac>3</mac>
    <windows>2</windows>
   </number>
   <binding>
@@ -113,6 +116,7 @@ $Id$
   <desc>Rudder</desc>
   <number>
    <unix>2</unix>
+   <mac>2</mac>
    <windows>3</windows>
   </number>
   <binding>
@@ -126,6 +130,7 @@ $Id$
   <desc>View Direction</desc>
   <number>
    <unix>4</unix>
+   <mac>4</mac>
    <windows>6</windows>
   </number>
   <low>
@@ -150,6 +155,7 @@ $Id$
   <desc>View Elevation</desc>
   <number>
    <unix>5</unix>
+   <mac>5</mac>
    <windows>7</windows>
   </number>
   <low>
@@ -174,6 +180,7 @@ $Id$
   <desc>Brakes</desc>
   <number>
    <unix>0</unix>
+   <mac>0</mac>
    <windows>0</windows>
   </number>
   <binding>
@@ -204,6 +211,7 @@ $Id$
   <desc>Elevator trim up</desc>
   <number>
    <unix>3</unix>
+   <mac>3</mac>
    <windows>3</windows>
   </number>
   <repeatable type="bool">true</repeatable>
@@ -218,6 +226,7 @@ $Id$
   <desc>Elevator trim down</desc>
   <number>
    <unix>4</unix>
+   <mac>4</mac>
    <windows>4</windows>
   </number>
   <repeatable type="bool">true</repeatable>
@@ -232,6 +241,7 @@ $Id$
   <desc>Flaps down</desc>
   <number>
    <unix>1</unix>
+   <mac>1</mac>
    <windows>1</windows>
   </number>
   <repeatable>false</repeatable>
@@ -245,6 +255,7 @@ $Id$
   <desc>Flaps up</desc>
   <number>
    <unix>2</unix>
+   <mac>2</mac>
    <windows>2</windows>
   </number>
   <repeatable>false</repeatable>
@@ -258,6 +269,7 @@ $Id$
   <desc>Right brake</desc>
   <number>
    <unix>6</unix>
+   <mac>6</mac>
    <windows>6</windows>
   </number>
   <binding>
@@ -278,6 +290,7 @@ $Id$
   <desc>Left brake</desc>
   <number>
    <unix>5</unix>
+   <mac>5</mac>
    <windows>5</windows>
   </number>
   <binding>
diff --git a/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml b/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml
index 3c10bd458..72b6df6e1 100644
--- a/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-force-feed-pro.xml
@@ -50,6 +50,7 @@ $Id:
   <desc>Rudder</desc>
   <number>
    <unix>2</unix>
+   <mac>2</mac>
    <windows>3</windows>
   </number>
   <binding>
@@ -63,6 +64,7 @@ $Id:
   <desc>Throttle</desc>
   <number>
    <unix>3</unix>
+   <mac>3</mac>
    <windows>2</windows>
   </number>
   <binding>
diff --git a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
index 1a005a7c7..d0fb8bfcf 100644
--- a/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
+++ b/Input/Joysticks/Microsoft/sidewinder-precision-pro.xml
@@ -55,6 +55,7 @@ $Id$
   <desc>Rudder</desc>
   <number>
    <unix>2</unix>
+   <mac>2</mac>
    <windows>3</windows>
   </number>
   <binding>
@@ -68,6 +69,7 @@ $Id$
   <desc>Throttle</desc>
   <number>
    <unix>3</unix>
+   <mac>3</mac>
    <windows>2</windows>
   </number>
   <binding>
@@ -80,6 +82,7 @@ $Id$
    <desc>View Direction</desc>
    <number>
     <unix>4</unix>
+    <mac>4</mac>
     <windows>6</windows>
    </number>
    <low>
@@ -104,6 +107,7 @@ $Id$
    <desc>View Elevation (Default)</desc>
    <number>
     <unix>5</unix>
+    <mac>5</mac>
    </number>
    <low>
     <repeatable>true</repeatable>
@@ -256,6 +260,7 @@ $Id$
   <desc>Gear Up.</desc>
   <number>
     <unix>8</unix>
+    <mac>8</mac>
     <windows>9</windows>
    </number>  
   <repeatable>false</repeatable>
diff --git a/Input/Joysticks/Saitek/Cyborg-Evo.xml b/Input/Joysticks/Saitek/Cyborg-Evo.xml
index fccf871a4..6b326ae52 100644
--- a/Input/Joysticks/Saitek/Cyborg-Evo.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Evo.xml
@@ -86,6 +86,7 @@ axis 5: 	(hat up-down)		look u/d		Trim Elevator		Adj Propeller	#
 	<desc>View Direction; Aileron Trim;</desc>
 	<number>
 		<unix>4</unix>
+		<mac>4</mac>
 		<windows>6</windows>
 	</number>
 	<low>
@@ -140,6 +141,7 @@ axis 5: 	(hat up-down)		look u/d		Trim Elevator		Adj Propeller	#
 	<desc>View Elevation; Elevator Trim;</desc>
 	<number>
 		<unix>5</unix>
+		<mac>5</mac>
 		<windows>7</windows>
 	</number>
 	<low>
@@ -245,6 +247,7 @@ axis 5: 	(hat up-down)		look u/d		Trim Elevator		Adj Propeller	#
 	<desc>Reset view; toggle tail-wheel lock; reset trim</desc>
 	<number>
 		<unix>1</unix>
+		<mac>1</mac>
 		<windows>1</windows>
 	</number>
 	<repeatable type="bool">false</repeatable>
diff --git a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
index bfebd65f3..2d62381a5 100644
--- a/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
+++ b/Input/Joysticks/Saitek/Cyborg-Gold-3d-USB.xml
@@ -111,6 +111,7 @@ ________________________________________________________________________________
 		<desc>Rudder</desc>
 		<number>
 			<unix>2</unix>
+			<mac>2</mac>
 			<windows>3</windows>
 		</number>
 		<binding>
@@ -126,6 +127,7 @@ ________________________________________________________________________________
 		<desc>Throttle</desc>
 		<number>
 			<unix>3</unix>
+			<mac>2</mac>
 			<windows>2</windows>
 		</number>
 		<binding>
diff --git a/Input/Joysticks/Saitek/X45.xml b/Input/Joysticks/Saitek/X45.xml
index 378af106e..f92236982 100644
--- a/Input/Joysticks/Saitek/X45.xml
+++ b/Input/Joysticks/Saitek/X45.xml
@@ -102,6 +102,7 @@ $Id$
  <axis n="6">
   <number>
    <unix>6</unix>
+   <mac>6</mac>
    <windows>6</windows>
    <mac>5</mac>
   </number>
@@ -126,6 +127,7 @@ $Id$
   <desc>View Elevation</desc>
   <number>
    <unix>7</unix>
+   <mac>7</mac>
    <windows>7</windows>
    <mac>6</mac>
   </number>
@@ -149,6 +151,7 @@ $Id$
   <desc>Throttle</desc>
   <number>
    <unix>4</unix>
+   <mac>4</mac>
    <windows>2</windows>
    <mac>2</mac>
   </number>
@@ -162,6 +165,7 @@ $Id$
   <desc>Mixture</desc>
   <number>
    <unix>2</unix>
+   <mac>2</mac>
    <windows>5</windows>
   </number>
   <binding>
@@ -174,6 +178,7 @@ $Id$
   <desc>Propeller Advance</desc>
   <number>
    <unix>5</unix>
+   <mac>5</mac>
    <windows>4</windows>
 <!-- <mac>???</mac> -->
   </number>
diff --git a/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml b/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
index 318595444..e92d70405 100644
--- a/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
+++ b/Input/Joysticks/ThrustMaster/Top-Gun-Afterburner.xml
@@ -109,6 +109,7 @@ ________________________________________________________________________________
 		<desc>Aileron</desc>
 		<number>
 			<unix>0</unix>
+			<mac>0</mac>
 			<windows>0</windows>
 		</number>
 		<binding>
@@ -122,6 +123,7 @@ ________________________________________________________________________________
 		<desc>Elevator</desc>
 		<number>
 			<unix>1</unix>
+			<mac>1</mac>
 			<windows>1</windows>
 		</number>
 		<binding>
@@ -136,6 +138,7 @@ ________________________________________________________________________________
 		<desc>Rudder</desc>
 		<number>
 			<unix>2</unix>
+			<mac>2</mac>
 			<windows>3</windows>
 		</number>
 		<binding>
@@ -161,6 +164,7 @@ ________________________________________________________________________________
 		<desc>Throttle</desc>
 		<number>
 			<unix>3</unix>
+			<mac>3</mac>
 			<windows>2</windows>
 		</number>
 		<dead-band type="double">0.0</dead-band>
@@ -466,6 +470,7 @@ ________________________________________________________________________________
 		<desc>View direction; mixture; aileron trim; rudder trim</desc>
 		<number>
 			<unix>5</unix>
+			<mac>5</mac>
 			<windows>6</windows>
 		</number>
 		<low>
@@ -533,6 +538,7 @@ ________________________________________________________________________________
 		<desc>View direction; prop pitch; elevator trim</desc>
 		<number>
 			<unix>6</unix>
+			<mac>6</mac>
 			<windows>7</windows>
 		</number>
 		<low>
diff --git a/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml b/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
index 207417939..df391d153 100644
--- a/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
+++ b/Input/Joysticks/ThrustMaster/Top-Gun-Fox2-Pro-USB.xml
@@ -81,6 +81,7 @@
   <desc>Throttle</desc>
   <number>
    <unix>3</unix>
+   <mac>3</mac>
    <windows>2</windows>
   </number>
   <binding>