diff --git a/scheme/lib/pop3.scm b/scheme/lib/pop3.scm
index 0b9bf17..25ed850 100644
--- a/scheme/lib/pop3.scm
+++ b/scheme/lib/pop3.scm
@@ -209,11 +209,11 @@
 ;;; Nothing exported below.
 
 (define-record-type pop3-connection :pop3-connection
-  (make-pop3-connection host-name command-socket logfd login password challenge state)
+  (make-pop3-connection host-name command-socket log-port login password challenge state)
   pop3-connection
   (host-name pop3-connection-host-name)
   (command-socket pop3-connection-command-socket)
-  (logfd pop3-connection-logfd)
+  (log-port pop3-connection-log-port)
   (login pop3-connection-login set-pop3-connection-login!)
   (password pop3-connection-password set-pop3-connection-password!)
   (challenge pop3-connection-challenge set-pop3-connection-challenge!)
@@ -245,11 +245,12 @@
 
 
 (define (pop3-log connection line)
-  (let ((LOG (pop3-connection-logfd connection)))
-    (and LOG
-         (write-string line LOG)
-         (write-string "\n" LOG)
-         (force-output LOG))))
+  (let ((log (pop3-connection-log-port connection)))
+    (if log
+	(begin
+	  (write-string line log)
+	  (write-string "\n" log)
+	  (force-output log)))))
 
 (define (pop3-send-command connection command)
   (let* ((sock (pop3-connection-command-socket connection))