diff --git a/jme3-core/src/main/resources/joystick-mapping.properties b/jme3-core/src/main/resources/joystick-mapping.properties
index 966832036..b4f1b77bd 100644
--- a/jme3-core/src/main/resources/joystick-mapping.properties
+++ b/jme3-core/src/main/resources/joystick-mapping.properties
@@ -69,3 +69,47 @@ Microsoft\ PC-joystick\ driver.12=POV +Y
 Microsoft\ PC-joystick\ driver.13=POV +X
 Microsoft\ PC-joystick\ driver.14=POV -Y
 Microsoft\ PC-joystick\ driver.15=POV -X
+
+# Logitech F310 gamepad with dip switch DirectInput
+Logitech\ Dual\ Action.1=2
+Logitech\ Dual\ Action.2=1
+Logitech\ Dual\ Action.3=0
+Logitech\ Dual\ Action.0=3
+
+# Logitech F310 gamepad with dip switch XInput
+Gamepad\ F310\ (Controller).0=2
+Gamepad\ F310\ (Controller).1=1
+Gamepad\ F310\ (Controller).2=3
+Gamepad\ F310\ (Controller).3=0
+
+Gamepad\ F310\ (Controller).6=8
+Gamepad\ F310\ (Controller).7=9
+
+Gamepad\ F310\ (Controller).8=10
+Gamepad\ F310\ (Controller).9=11
+
+Gamepad\ F310\ (Controller).rx=z
+Gamepad\ F310\ (Controller).ry=rz
+
+# requires custom code to support trigger buttons but this
+# keeps it from confusing the .rx mapping.
+Gamepad\ F310\ (Controller).z=trigger
+
+# Alternate version of the XBOX 360 controller
+XBOX\ 360\ For\ Windows\ (Controller).0=2
+XBOX\ 360\ For\ Windows\ (Controller).1=1
+XBOX\ 360\ For\ Windows\ (Controller).2=3
+XBOX\ 360\ For\ Windows\ (Controller).3=0
+
+XBOX\ 360\ For\ Windows\ (Controller).6=8
+XBOX\ 360\ For\ Windows\ (Controller).7=9
+
+XBOX\ 360\ For\ Windows\ (Controller).8=10
+XBOX\ 360\ For\ Windows\ (Controller).9=11
+
+XBOX\ 360\ For\ Windows\ (Controller).rx=z
+XBOX\ 360\ For\ Windows\ (Controller).ry=rz
+
+# requires custom code to support trigger buttons but this
+# keeps it from confusing the .rx mapping.
+XBOX\ 360\ For\ Windows\ (Controller).z=trigger