diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm
index 33c2f05..9c1a1de 100644
--- a/scheme/httpd/cgi-server.scm
+++ b/scheme/httpd/cgi-server.scm
@@ -111,7 +111,7 @@
 	 (env (cgi-env req bin-dir (cdr path) request-invariant-cgi-env))
 
 	 (doit (lambda ()
-		 (dup->inport  (current-input-port) 0)
+		 (dup->inport  (socket:inport (request-socket req)) 0)
 		 (dup->outport (current-output-port) 1)
 		 (dup 1 2)
 		 (apply exec/env filename env argv))))
@@ -199,7 +199,7 @@
 	  ("PATH_TRANSLATED" . ,path-translated)
 	  ("SCRIPT_NAME"     . ,script-name)
 
-	  ("REMOTE_HOST"  . ,(host-name-or-ip raddr))
+;	  ("REMOTE_HOST"  . ,(host-name-or-ip raddr))
 	  ("REMOTE_ADDR"  . ,(format-internet-host-address rhost))
 
 	  ;; ("AUTH_TYPE" . xx)			; Random authentication