diff --git a/engine/src/core-data/joystick-mapping.properties b/engine/src/core-data/joystick-mapping.properties
index 61b9d64d0..5f29e4105 100644
--- a/engine/src/core-data/joystick-mapping.properties
+++ b/engine/src/core-data/joystick-mapping.properties
@@ -32,4 +32,27 @@ Controller\ (Xbox\ 360\ Wireless\ Receiver\ for\ Windows).8=10
 Controller\ (Xbox\ 360\ Wireless\ Receiver\ for\ Windows).9=11
 
 Controller\ (Xbox\ 360\ Wireless\ Receiver\ for\ Windows).rx=z
-Controller\ (Xbox\ 360\ Wireless\ Receiver\ for\ Windows).ry=rz
\ No newline at end of file
+Controller\ (Xbox\ 360\ Wireless\ Receiver\ for\ Windows).ry=rz
+
+# requires custom code to support trigger buttons but this
+# keeps it from confusing the .rx mapping.
+Controller\ (Xbox\ 360\ Wireless\ Receiver\ for\ Windows).z=trigger
+ 
+# Xbox 360 Controller (copied from wireless version)
+Controller\ (XBOX\ 360\ For\ Windows).0=2
+Controller\ (XBOX\ 360\ For\ Windows).1=1
+Controller\ (XBOX\ 360\ For\ Windows).2=3
+Controller\ (XBOX\ 360\ For\ Windows).3=0
+ 
+Controller\ (XBOX\ 360\ For\ Windows).6=8
+Controller\ (XBOX\ 360\ For\ Windows).7=9
+ 
+Controller\ (XBOX\ 360\ For\ Windows).8=10
+Controller\ (XBOX\ 360\ For\ Windows).9=11
+ 
+Controller\ (XBOX\ 360\ For\ Windows).rx=z
+Controller\ (XBOX\ 360\ For\ Windows).ry=rz
+ 
+# requires custom code to support trigger buttons but this
+# keeps it from confusing the .rx mapping.
+Controller\ (XBOX\ 360\ For\ Windows).z=trigger