diff --git a/src/main/java/org/dynmap/flat/FlatMap.java b/src/main/java/org/dynmap/flat/FlatMap.java
index a3d28e56..bd75b31b 100644
--- a/src/main/java/org/dynmap/flat/FlatMap.java
+++ b/src/main/java/org/dynmap/flat/FlatMap.java
@@ -117,7 +117,7 @@ public class FlatMap extends MapType {
                     pixel[2] += (255-pixel[2]) * scale;
                 }
                 
-                raster.setPixel(x, y, pixel);
+                raster.setPixel(t.size-y-1, x, pixel);
                 rendered = true;
             }
 
@@ -148,7 +148,7 @@ public class FlatMap extends MapType {
 
         @Override
         public String getFilename() {
-            return map.prefix + "_" + size + "_" + x + "_" + y + ".png";
+            return map.prefix + "_" + size + "_" + -(y+1) + "_" + x + ".png";
         }
     }
 }
diff --git a/web/js/flatmap.js b/web/js/flatmap.js
index 1ceaa154..4962c71d 100644
--- a/web/js/flatmap.js
+++ b/web/js/flatmap.js
@@ -7,7 +7,7 @@ FlatProjection.prototype = {
 			return new google.maps.LatLng(point.x/128.0, point.y/128.0);
 		},
 		fromWorldToLatLng: function(x, y, z) {
-			return new google.maps.LatLng(x / 128.0, z / 128.0);
+			return new google.maps.LatLng(-z / 128.0, x / 128.0);
 		}
 };