diff --git a/jme3-core/src/main/resources/joystick-mapping.properties b/jme3-core/src/main/resources/joystick-mapping.properties
index 83a6996de..3fb4791bf 100644
--- a/jme3-core/src/main/resources/joystick-mapping.properties
+++ b/jme3-core/src/main/resources/joystick-mapping.properties
@@ -149,6 +149,25 @@ XBOX\ 360\ For\ Windows\ (Controller).ry=rz
 # keeps it from confusing the .rx mapping.
 XBOX\ 360\ For\ Windows\ (Controller).z=trigger
 
+#Xbox One S controller
+Microsoft\ X-Box\ One\ S\ pad.0=2
+Microsoft\ X-Box\ One\ S\ pad.1=1
+Microsoft\ X-Box\ One\ S\ pad.2=3
+Microsoft\ X-Box\ One\ S\ pad.3=0
+
+Microsoft\ X-Box\ One\ S\ pad.6=8
+Microsoft\ X-Box\ One\ S\ pad.7=9
+
+Microsoft\ X-Box\ One\ S\ pad.8=10
+Microsoft\ X-Box\ One\ S\ pad.9=11
+
+Microsoft\ X-Box\ One\ S\ pad.rx=z
+Microsoft\ X-Box\ One\ S\ pad.ry=rz
+
+# requires custom code to support trigger buttons but this
+# keeps it from confusing the .rx mapping.
+Microsoft\ X-Box\ One\ S\ pad.z=trigger
+
 # from : Freebox controller as "DragonRise Inc.   Generic   USB  Joystick"
 DragonRise\ Inc.\ \ \ Generic\ \ \ USB\ \ Joystick.x=rx
 DragonRise\ Inc.\ \ \ Generic\ \ \ USB\ \ Joystick.y=ry
@@ -174,4 +193,4 @@ GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.2=11
 GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.5=POV +X
 GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.6=POV -Y
 GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.7=POV -X
-GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.4=POV +Y
\ No newline at end of file
+GASIA\ CORP.\ PLAYSTATION(R)3\ Controller.4=POV +Y