diff --git a/src/Makefile b/src/Makefile
index 8568f2c..5d4a6f1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -261,7 +261,7 @@ UTIL-SET-LIST-SOURCES=util-set-list.scm testing.import.scm	\
 util-set-list.o: util-set-list.import.scm
 util-set-list.import.scm: $(UTIL-SET-LIST-SOURCES)
 
-UTIL-TIME-SOURCES=util-time.scm
+UTIL-TIME-SOURCES=util-time.scm duck.import.scm
 
 util-time.o: util-time.import.scm
 util-time.import.scm: $(UTIL-TIME-SOURCES)
diff --git a/src/util-time.scm b/src/util-time.scm
index 788d8c7..0d96b18 100644
--- a/src/util-time.scm
+++ b/src/util-time.scm
@@ -25,12 +25,12 @@
 
 (declare (unit util-time))
 
-;;; # Utilities
+(import duck)
 
-(module
+(module*
  util-time
+ #:doc ("Compatibility time module for <5.2 and >=5.3 versions of CHICKEN.")
 
- ;;; Test
  (
   current-util-milliseconds
   seconds->iso-date-string
@@ -42,8 +42,8 @@
 	 (chicken time posix)
 	 (chicken format))
 
- ;;; Compatibility wrapper
- (define (current-util-milliseconds)
+ (define/doc (current-util-milliseconds)
+   ("Returns the current milliseconds counter that can be used for high-precision time measurements.")
    (cond-expand
     (chicken-5.0
      (current-milliseconds))
@@ -54,8 +54,8 @@
     (else
      (current-process-milliseconds))))
 
- ;;; Converts seconds since epoch to ISO date string
- (define (seconds->iso-date-string . args)
+ (define/doc (seconds->iso-date-string . args)
+   ("Converts given seconds to ISO date string. Defaults to ```(current-seconds)```.")
    (let ((d (apply seconds->local-time args)))
      (format "~A-~A-~A"
 	     (number->string