diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81d62df..6948f12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.2)
 project(libravatarserv
-        VERSION 0.6.0
+        VERSION 0.6.1
         LANGUAGES CXX
 )
 
diff --git a/src/http.cpp b/src/http.cpp
index e6e565c..9ffccb9 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -29,7 +29,7 @@ const Request http::parse_request(const string &request)
     if (request.substr(0, 8) != "/avatar/" ||
         request.find("..", 8) != std::string::npos)
     {
-        cout << "Status: 404 Not Found\n\n";
+        cout << "Status: 400 Bad Request\n\n";
         cerr << "Error: Invalid URL.\n";
         std::exit(0);
     }
diff --git a/src/libravatarserv.cpp b/src/libravatarserv.cpp
index 73984b9..e263c3f 100644
--- a/src/libravatarserv.cpp
+++ b/src/libravatarserv.cpp
@@ -40,14 +40,14 @@ int main()
     const char *request = std::getenv("REQUEST_URI");
     if (request == nullptr)
     {
-        cout << "Status: 404 Not Found\n\n";
+        cout << "Status: 400 Bad Request\n\n";
         cerr << "Error: ${REQUEST_URI} is empty.\n";
         return 1;
     }
 
     if (!find_avatar_dir())
     {
-        cout << "Status: 404 Not Found\n\n";
+        cout << "Status: 503 Service Unavailable\n\n";
         cerr << "Error: No avatars found.\n";
         return 3;
     }
@@ -108,7 +108,7 @@ int main()
             }
             else
             {
-                cout << "Status: 404 Not Found\n\n";
+                cout << "Status: 500 Internal Server Error\n\n";
                 cerr << "Error: Couldn't generate identicon.\n";
             }
         }
@@ -117,11 +117,10 @@ int main()
             if (global::settings.redirect_nofallback)
             {
                 http::send_redirect(avatar);
-                return 0;
             }
             else
             {
-                cout << "Status: 404 Not Found\n\n";
+                cout << "Status: 501 Not Implemented\n\n";
             }
         }
     }