diff --git a/brouter-server/src/main/java/btools/server/request/ServerHandler.java b/brouter-server/src/main/java/btools/server/request/ServerHandler.java
index c459322..50f0766 100644
--- a/brouter-server/src/main/java/btools/server/request/ServerHandler.java
+++ b/brouter-server/src/main/java/btools/server/request/ServerHandler.java
@@ -40,6 +40,8 @@ public class ServerHandler extends RequestHandler {
 
   private RoutingContext rc;
 
+  private static boolean useOldServerFormat = System.getenv("USEOLDSERVERFORMAT") != null;
+
   public ServerHandler(ServiceContext serviceContext, Map<String, String> params) {
     super(serviceContext, params);
   }
@@ -107,7 +109,10 @@ public class ServerHandler extends RequestHandler {
       } else if ("kml".equals(format)) {
         result = "application/vnd.google-earth.kml+xml";
       } else if ("geojson".equals(format)) {
-        result = "application/geo+json";
+        if (useOldServerFormat)
+          result = "application/vnd.geo+json";
+        else
+          result = "application/geo+json";
       } else if ("csv".equals(format)) {
         result = "text/tab-separated-values";
       }