diff --git a/Source/Core/GZBuilder/md3/ModelReader.cs b/Source/Core/GZBuilder/md3/ModelReader.cs
index 205ab66e65fef7b90c2461a595962b8197483438..e7297ed53d2ddd7f1ffedbd75054a76fdab7bec7 100755
--- a/Source/Core/GZBuilder/md3/ModelReader.cs
+++ b/Source/Core/GZBuilder/md3/ModelReader.cs
@@ -334,9 +334,9 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
                 WorldVertex Vert = new WorldVertex();
                 stream_a.Position = start_a + (i + frame * d3d_numverts) * 4;
                 int v_uint = br_a.ReadInt32();
-                Vert.x = UnpackUVertex(v_uint, 0);
-                Vert.y = UnpackUVertex(v_uint, 1);
-                Vert.z = UnpackUVertex(v_uint, 2);
+                Vert.y = -UnpackUVertex(v_uint, 0);
+                Vert.z = UnpackUVertex(v_uint, 1);
+                Vert.x = UnpackUVertex(v_uint, 2);
                 vertices[i] = Vert;
             }
 
@@ -391,9 +391,9 @@ namespace CodeImp.DoomBuilder.GZBuilder.MD3
                     nsum.z += norm.z;
                     total++;
                 }
-                vertices[i].nx = -nsum.x / total;
-                vertices[i].ny = -nsum.y / total;
-                vertices[i].nz = -nsum.z / total;
+                vertices[i].nx = nsum.x / total;
+                vertices[i].ny = nsum.y / total;
+                vertices[i].nz = nsum.z / total;
             }
 
             List<int> exGroups = new List<int>();
diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs
index 02e38eabc3bb3112e1dedfe7d18e0aeaebdfb44d..903a0194e141c4079e3932e3743dcd40b5fed9ed 100755
--- a/Source/Core/Properties/AssemblyInfo.cs
+++ b/Source/Core/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.3023")]
+[assembly: AssemblyVersion("2.3.0.3024")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("85f00ab")]
+[assembly: AssemblyHash("260ffbe")]
diff --git a/Source/Core/ZDoom/ModeldefParser.cs b/Source/Core/ZDoom/ModeldefParser.cs
index 379e652bba3ab5a8cc1ad4c423cf1bad192a8155..2549074af5d10c9182e9527c8cc1f7ef7be879e4 100755
--- a/Source/Core/ZDoom/ModeldefParser.cs
+++ b/Source/Core/ZDoom/ModeldefParser.cs
@@ -103,7 +103,8 @@ namespace CodeImp.DoomBuilder.ZDoom
 
 									// Things are complicated in GZDoom...
 									Matrix moffset = Matrix.Translation(mds.Offset.Y, -mds.Offset.X, mds.Offset.Z);
-									Matrix mrotation = Matrix.RotationZ(Angle2D.DegToRad(mds.AngleOffset)) * Matrix.RotationY(-Angle2D.DegToRad(mds.RollOffset)) * Matrix.RotationX(-Angle2D.DegToRad(mds.PitchOffset));
+                                    //Matrix mrotation = Matrix.RotationZ(Angle2D.DegToRad(mds.AngleOffset)) * Matrix.RotationY(-Angle2D.DegToRad(mds.RollOffset)) * Matrix.RotationX(-Angle2D.DegToRad(mds.PitchOffset));
+                                    Matrix mrotation = Matrix.RotationY(-Angle2D.DegToRad(mds.RollOffset)) * Matrix.RotationX(-Angle2D.DegToRad(mds.PitchOffset)) * Matrix.RotationZ(Angle2D.DegToRad(mds.AngleOffset));
                                     md.SetTransform(mrotation, moffset, mds.Scale);
 
 									// Add models
diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
index 4e0992178658e7f1d7250c059987b44672ae8465..47f4562faf2c1f804b288e77dfe7dede5c2710bc 100755
--- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
+++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Resources;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.3023")]
+[assembly: AssemblyVersion("2.3.0.3024")]
 [assembly: NeutralResourcesLanguageAttribute("en")]