diff --git a/glm/gtx/euler_angles.inl b/glm/gtx/euler_angles.inl
index b3102242..a1afcf3a 100644
--- a/glm/gtx/euler_angles.inl
+++ b/glm/gtx/euler_angles.inl
@@ -250,7 +250,7 @@ namespace glm
 		detail::tvec3<T, P> const & angles
 	)
 	{
-		return detail::tmat3x3<T, P>(yawPitchRoll(angles.x, angles.y, angles.z));
+		return detail::tmat3x3<T, P>(yawPitchRoll(angles.z, angles.x, angles.y));
 	}
 
 	template <typename T, precision P>
diff --git a/readme.txt b/readme.txt
index 416f3619..e7dd0eb0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -47,6 +47,7 @@ GLM 0.9.5.4: 2014-0X-XX
 - Optimized Quaternion vector rotation #205
 - Fixed missing doxygen @endcond tag #211
 - Fixed instruction set detection with Clang #158
+- Fixed orientate3 function #207
 
 ================================================================================
 GLM 0.9.5.3: 2014-04-02