diff --git a/src/libravatarserv.cpp b/src/libravatarserv.cpp
index 4368273..7843364 100644
--- a/src/libravatarserv.cpp
+++ b/src/libravatarserv.cpp
@@ -32,6 +32,7 @@ fs::path global::avatar_dir = "";
 
 int main()
 {
+    cout << "Server: libravatarserv/" << global::version << endl;
     const char *request = std::getenv("REQUEST_URI");
     if (request == nullptr)
     {
@@ -55,8 +56,7 @@ int main()
     {
         cout << "Content-type: image/png\n";
         cout << "Cache-Control: max-age=86400\n";
-        cout << "Connection: close\n";
-        cout << "Server: libravatarserv/" << global::version << endl << endl;
+        cout << "Connection: close\n\n";
         cout.flush();   // We need to flush before we use /dev/stdout directly.
         answer.image.write("/dev/stdout");
     }