diff --git a/ftpd.scm b/ftpd.scm
index 5afe717..574dbeb 100644
--- a/ftpd.scm
+++ b/ftpd.scm
@@ -135,7 +135,9 @@
 		    (- (current-seconds) start-transfer-seconds)  ; transfer time in secs
 		    (socket-address->string (socket-remote-address (session-data-socket)) #f) ; remote host name
 		    (file-info:size info)         ; file size in bytes
-		    full-path                     ; name of file
+		    (string-map (lambda (c) 
+				  (if (eq? c #\space) #\_ c)) 
+				full-path)                     ; name of file (spaces replaced by "_")
 		    (case (session-type)
 		      ((ascii) "a")
 		      ((image) "b")
@@ -1214,7 +1216,7 @@
 
 ; Version
 
-(define *ftpd-version* "$Revision: 1.34 $")
+(define *ftpd-version* "$Revision: 1.35 $")
 
 (define (copy-port->port-binary input-port output-port)
   (let ((buffer (make-string *window-size*)))