diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0181df058..872fb9c37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changes
 
+## 0.5.9
+
+* Expanded and changed status code description mapping according to IANA registry:
+ * https://github.com/tiny-http/tiny-http/pull/138
+
 ## 0.5.8
 
 * Update links to reflect repository ownership change: https://github.com/frewsxcv/tiny-http -> https://github.com/tiny-http/tiny-http
diff --git a/src/common.rs b/src/common.rs
index 620dd192f..984c39b10 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -32,7 +32,8 @@ impl StatusCode {
             100 => "Continue",
             101 => "Switching Protocols",
             102 => "Processing",
-            118 => "Connection timed out",
+            103 => "Early Hints",
+
             200 => "OK",
             201 => "Created",
             202 => "Accepted",
@@ -41,7 +42,9 @@ impl StatusCode {
             205 => "Reset Content",
             206 => "Partial Content",
             207 => "Multi-Status",
-            210 => "Content Different",
+            208 => "Already Reported",
+            226 => "IM Used",
+
             300 => "Multiple Choices",
             301 => "Moved Permanently",
             302 => "Found",
@@ -49,6 +52,8 @@ impl StatusCode {
             304 => "Not Modified",
             305 => "Use Proxy",
             307 => "Temporary Redirect",
+            308 => "Permanent Redirect",
+
             400 => "Bad Request",
             401 => "Unauthorized",
             402 => "Payment Required",
@@ -57,22 +62,37 @@ impl StatusCode {
             405 => "Method Not Allowed",
             406 => "Not Acceptable",
             407 => "Proxy Authentication Required",
-            408 => "Request Time-out",
+            408 => "Request Timeout",
             409 => "Conflict",
             410 => "Gone",
             411 => "Length Required",
             412 => "Precondition Failed",
-            413 => "Request Entity Too Large",
-            414 => "Reques-URI Too Large",
+            413 => "Payload Too Large",
+            414 => "URI Too Long",
             415 => "Unsupported Media Type",
-            416 => "Request range not satisfiable",
+            416 => "Range Not Satisfiable",
             417 => "Expectation Failed",
+            421 => "Misdirected Request",
+            422 => "Unprocessable Entity",
+            423 => "Locked",
+            424 => "Failed Dependency",
+            426 => "Upgrade Required",
+            428 => "Precondition Required",
+            429 => "Too Many Requests",
+            431 => "Request Header Fields Too Large",
+            451 => "Unavailable For Legal Reasons",
+
             500 => "Internal Server Error",
             501 => "Not Implemented",
             502 => "Bad Gateway",
             503 => "Service Unavailable",
-            504 => "Gateway Time-out",
-            505 => "HTTP Version not supported",
+            504 => "Gateway Timeout",
+            505 => "HTTP Version Not Supported",
+            506 => "Variant Also Negotiates",
+            507 => "Insufficient Storage",
+            508 => "Loop Detected",
+            510 => "Not Extended",
+            511 => "Network Authentication Required",
             _ => "Unknown"
         }
     }