diff --git a/server.py b/server.py
index 2ad57e2..cde6327 100755
--- a/server.py
+++ b/server.py
@@ -88,7 +88,8 @@ def sendPicture(path):
         scaleX = round(float(x2))
    
     pathDebug = path
-    path = generatePicture(path, scaleX, scaleY, flask.request.args.get("encoding"), 
+    encoding = flask.request.args.get("encoding")
+    path = generatePicture(path, scaleX, scaleY, encoding, 
                             bool(flask.request.args.get("crop")))
     if not path:
         return ("File not found: {}".format(os.path.join(PICTURE_DIR, pathDebug)), 404)
@@ -107,6 +108,9 @@ def sendPicture(path):
     else:
         response.headers['Cache-Control'] = "max-age=" + "3600"
 
+    if encoding:
+        response.headers['Content-Type'] = "image/{}".format(encoding)
+
     return response
 
 @app.route("/")