diff --git a/Cargo.toml b/Cargo.toml
index 695b7e2..73424ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,5 +20,9 @@ mime = "0.3.16"
 log = "0.4"
 simple_logger = "1"
 
+[profile.release]
+lto = true
+codegen-units = 1
+
 [workspace]
 members = [ "cgi-scripts/agena-cgi" ]
diff --git a/src/main.rs b/src/main.rs
index ad549bf..c6ed7e5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -123,6 +123,13 @@ async fn handle_connection(
         request = request.replacen("//", "gemini://", 1);
     }
 
+    if request.ends_with("\n") {
+        request.pop();
+        if request.ends_with("\r") {
+            request.pop();
+        }
+    }
+
     let url = match Url::parse(&request) {
         Ok(url) => url,
         Err(_) => {