diff --git a/modules.scm b/modules.scm
index 2f2d247..1fd582e 100644
--- a/modules.scm
+++ b/modules.scm
@@ -308,6 +308,7 @@
 	httpd-read-options
 	rate-limit
 	string-lib     ; STRING-JOIN
+	i/o            ; make-null-output-port
 	scheme)
   (files httpd-core))
 
@@ -689,8 +690,12 @@
 ;; nettime.scm is a module for requesting the time on remote machines,
 ;; using the time or the daytime protocol
 (define-interface nettime-interface
+  (export net-time
+          net-daytime))
+
+(define-interface nettime-obsolete-interface
   (export net:time
-          net:daytime))
+	  net:daytime))
 
 
 (define-structure nettime nettime-interface
@@ -698,6 +703,12 @@
         scheme)
   (files nettime))
 
+(define-structure nettime-obsolete nettime-obsolete-interface
+  (open scsh
+	scheme
+	nettime)
+  (files nettime-obsolete))
+
 
 ;;; Here is toothless.scm
 ;;; Shouldn't the definitions be in an extra file? Andreas.
diff --git a/nettime-obsolete.scm b/nettime-obsolete.scm
new file mode 100644
index 0000000..01b9a92
--- /dev/null
+++ b/nettime-obsolete.scm
@@ -0,0 +1,6 @@
+; maps obsolete nettime-procedure names to new nettime procedure names
+; by Andreas Bernauer (2002)
+
+(define net:time net-time)
+(define net:daytime net-daytime)
+
diff --git a/nettime.scm b/nettime.scm
index d97627a..6ad772f 100644
--- a/nettime.scm
+++ b/nettime.scm
@@ -1,6 +1,6 @@
 ;;; nettime.scm -- obtain the time on remote machines
 ;;
-;; $Id: nettime.scm,v 1.2 2001/11/15 11:12:24 mainzelm Exp $
+;; $Id: nettime.scm,v 1.3 2002/05/12 05:32:28 interp Exp $
 ;;
 ;; Please send suggestions and bug reports to <emarsden@mail.dotcom.fr>
 
@@ -35,7 +35,7 @@
 ;; subtract 70 years' worth of seconds at the end, since the time
 ;; protocol returns the number of seconds since 1900, whereas Unix
 ;; time is since 1970.
-(define (net:time host tcp/udp)
+(define (net-time host tcp/udp)
   (let* ((hst-info (host-info host))
          (srvc-info (service-info "time" "tcp"))         
          (sock (socket-connect protocol-family/internet
@@ -47,7 +47,7 @@
     (- result 2208988800)))
 
 
-(define (net:daytime host tcp/udp)
+(define (net-daytime host tcp/udp)
   (let* ((hst-info (host-info host))
          (srvc-info (service-info "daytime" "tcp"))
          (sock (socket-connect protocol-family/internet