diff --git a/smtp.scm b/smtp.scm
index a3746dc..7d7fc6b 100644
--- a/smtp.scm
+++ b/smtp.scm
@@ -13,10 +13,8 @@
 ;;; scsh's socket module		
 ;;; :optional
 ;;; error
-;;; switchq					(Conditional macro)
-;;; ?						(COND)
 ;;; read-crlf-line write-crlf
-;;; \n \r in strings				(Not R4RS)
+;;; \n \r in strings				(Not R5RS)
 
 ;;; SMTP protocol procedures tend to return two values:
 ;;; - CODE The integer SMTP reply code returned by server for the transaction.
@@ -39,8 +37,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-;;; This is broken -- the (SYSTEM-NAME) proc returns a local name, not a
-;;; useful Internet host name. How do we do that?
+;;; This is broken -- the (SYSTEM-NAME) proc returns a local name, not
+;;; a useful Internet host name. How do we do that?  
+;;; [Andreas:] I've inserted a way to do this. It works fine on my
+;;; system. Does it work on your, too?
 
 ;;; (sendmail to-list body [host])
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -58,7 +58,7 @@
 (define (sendmail to-list body . maybe-host)
   (call-with-current-continuation
    (lambda (bailout)
-     (let ((local (system-name))
+     (let ((local (host-info:name (host-info (system-name))))
 	   (socket (smtp/open (:optional maybe-host "localhost"))))
        (receive (code text) (smtp-transactions socket	; Do prologue.
 			      (smtp/helo socket local)