diff --git a/ice-9/ChangeLog b/ice-9/ChangeLog
index 0cec9272c..5811e4735 100644
--- a/ice-9/ChangeLog
+++ b/ice-9/ChangeLog
@@ -1,3 +1,7 @@
+1999-02-16  Maciej Stachowiak  <mstachow@alum.mit.edu>
+
+	* optargs.scm (lambda*): Handle empty argument lists properly.
+
 1999-02-15  Jim Blandy  <jimb@savonarola.red-bean.com>
 
 	Fix from Russ McManus:
diff --git a/ice-9/optargs.scm b/ice-9/optargs.scm
index d341cf19f..b63f4f666 100644
--- a/ice-9/optargs.scm
+++ b/ice-9/optargs.scm
@@ -369,6 +369,7 @@
 	       (else (parse-opt-and-fixed arglist '() #f rest cont)))))))))
   (define (parse-rest arglist cont)
     (cond 
+     ((null? arglist) (cont '() '() '() #f #f))
      ((not (pair? arglist)) (cont '() '() '() #f arglist))
      ((not (list? arglist))
 	  (let* ((copy (list-copy arglist))