diff --git a/CMakeLists.txt b/CMakeLists.txt
index a71b7a7..b1244fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.2)
 project(libravatarserv
-        VERSION 0.6.2
+        VERSION 0.6.3
         LANGUAGES CXX
 )
 
diff --git a/src/image.cpp b/src/image.cpp
index bf11db9..e60bd74 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -17,6 +17,7 @@
 #include <iostream>
 #include <sstream>
 #include <array>
+#include <algorithm>
 #include "libravatarserv.hpp"
 
 using std::cout;
@@ -67,7 +68,10 @@ const Image image::get(const string &digest, const uint16_t size)
 
 void image::write(Image &image)
 {
-    cout << "Content-type: image/png\n\n";
+    string magick = image.image.magick();
+    std::transform(magick.begin(), magick.end(), magick.begin(), ::tolower);
+
+    cout << "Content-Type: image/" << magick << "\n\n";
     cout.flush();   // We need to flush before we use /dev/stdout directly.
     image.image.write("/dev/stdout");
 }