diff --git a/project/java/Accelerometer.java b/project/java/Accelerometer.java
index 3e93b82e9..7a026d124 100644
--- a/project/java/Accelerometer.java
+++ b/project/java/Accelerometer.java
@@ -89,7 +89,12 @@ class AccelerometerReader implements SensorEventListener
 	public void onSensorChanged(SensorEvent event)
 	{
 		if( Globals.HorizontalOrientation )
-			nativeAccelerometer(event.values[1], -event.values[0], event.values[2]);
+		{
+			if( gyro.invertedOrientation )
+				nativeAccelerometer(-event.values[1], event.values[0], event.values[2]);
+			else
+				nativeAccelerometer(event.values[1], -event.values[0], event.values[2]);
+		}
 		else
 			nativeAccelerometer(event.values[0], event.values[1], event.values[2]); // TODO: not tested!
 	}
diff --git a/project/jni/application/teeworlds/src b/project/jni/application/teeworlds/src
index 3f1e3a48f..066b0d8dd 160000
--- a/project/jni/application/teeworlds/src
+++ b/project/jni/application/teeworlds/src
@@ -1 +1 @@
-Subproject commit 3f1e3a48fcb053380f358bc5be3421838f2e1c9d
+Subproject commit 066b0d8dd07567ee598b5a3831843b5464a68e52