diff --git a/src/client/response/meta/status.rs b/src/client/response/meta/status.rs
index 3cd1244..45f386b 100644
--- a/src/client/response/meta/status.rs
+++ b/src/client/response/meta/status.rs
@@ -1,20 +1,42 @@
+//! Parser and holder API for [Status code](https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes)
+
 pub mod error;
 pub use error::Error;
 
 use glib::GString;
 
-/// https://geminiprotocol.net/docs/protocol-specification.gmi#status-codes
 #[derive(Debug)]
 pub enum Status {
     // Input
     Input = 10,
     SensitiveInput = 11,
+
     // Success
     Success = 20,
+
     // Redirect
     Redirect = 30,
     PermanentRedirect = 31,
-} // @TODO
+
+    // Temporary failure
+    TemporaryFailure = 40,
+    ServerUnavailable = 41,
+    CgiError = 42,
+    ProxyError = 43,
+    SlowDown = 44,
+
+    // Permanent failure
+    PermanentFailure = 50,
+    NotFound = 51,
+    ResourceGone = 52,
+    ProxyRequestRefused = 53,
+    BadRequest = 59,
+
+    // Client certificates
+    CertificateRequest = 60,
+    CertificateUnauthorized = 61,
+    CertificateInvalid = 62,
+}
 
 impl Status {
     pub fn from_utf8(buffer: &[u8]) -> Result<Self, Error> {
@@ -29,11 +51,30 @@ impl Status {
 
     pub fn from_string(code: &str) -> Result<Self, Error> {
         match code {
+            // Input
             "10" => Ok(Self::Input),
             "11" => Ok(Self::SensitiveInput),
+            // Success
             "20" => Ok(Self::Success),
+            // Redirect
             "30" => Ok(Self::Redirect),
             "31" => Ok(Self::PermanentRedirect),
+            // Temporary failure
+            "40" => Ok(Self::TemporaryFailure),
+            "41" => Ok(Self::ServerUnavailable),
+            "42" => Ok(Self::CgiError),
+            "43" => Ok(Self::ProxyError),
+            "44" => Ok(Self::SlowDown),
+            // Permanent failure
+            "50" => Ok(Self::PermanentFailure),
+            "51" => Ok(Self::NotFound),
+            "52" => Ok(Self::ResourceGone),
+            "53" => Ok(Self::ProxyRequestRefused),
+            "59" => Ok(Self::BadRequest),
+            // Client certificates
+            "60" => Ok(Self::CertificateRequest),
+            "61" => Ok(Self::CertificateUnauthorized),
+            "62" => Ok(Self::CertificateInvalid),
             _ => Err(Error::Undefined),
         }
     }