diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm
index 2ccfc99..2c0cbfe 100644
--- a/scheme/httpd/cgi-server.scm
+++ b/scheme/httpd/cgi-server.scm
@@ -287,7 +287,7 @@
    ((null? (cdr stat-lines)) 	    ; One line status header.
     (with-fatal-error-handler*
        (lambda (c d)
-	 (http-error http-status/internal-error req
+	 (http-error http-status/bad-gateway req
 		     "CGI script generated an invalid status header."
 		     (car stat-lines) c))
        (lambda ()
@@ -295,5 +295,5 @@
 	   (cons (string->number (substring status 0 3))	; number
 		 (substring/shared status 4))))))		; text
    (else			    ; Vas ist das?
-    (http-error http-status/internal-error req
+    (http-error http-status/bad-gateway req
 		"CGI script generated multi-line status header."))))
\ No newline at end of file
diff --git a/scheme/httpd/info-gateway.scm b/scheme/httpd/info-gateway.scm
index e6d2531..1f56d69 100644
--- a/scheme/httpd/info-gateway.scm
+++ b/scheme/httpd/info-gateway.scm
@@ -141,7 +141,7 @@
 	   (lambda (c decline)
 	     (cond
 	      ((info-gateway-error? c)
-	       (apply http-error http-status/internal-error req
+	       (apply http-error http-status/bad-gateway req
 		      (condition-stuff c)))
 	      ((http-error? c)
 	       (apply http-error (car (condition-stuff c)) req