diff --git a/THANKS b/THANKS
index 2845273c9..1b3ca3414 100644
--- a/THANKS
+++ b/THANKS
@@ -19,6 +19,7 @@ For fixes or providing information which led to a fix:
       Chris Cramer
       I. N. Golubev
      Martin Grabmueller
+     Andres Holst
        Brad Knotwell
    Matthias Köppe
       Bruce Korb
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index ec419a2af..e29d442d7 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-23  Mikael Djurfeldt  <mdj@linnaeus.mit.edu>
+
+	* eval.c (SCM_APPLY): Added # args check for application of
+	procedures with arity 3.  (Thanks to Anders Holst.)
+
 2001-01-24  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* filesys.h (SCM_DIR_FLAG_OPEN, SCM_DIR_OPEN_P):  Added.
diff --git a/libguile/eval.c b/libguile/eval.c
index 0a3ff46f7..62bef0b4b 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 96, 97, 98, 99, 2000, 2001 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -3338,6 +3338,10 @@ tail:
 	RETURN (arg1)
       }
     case scm_tc7_subr_3:
+      SCM_ASRTGO (SCM_NNULLP (args)
+		  && SCM_NNULLP (SCM_CDR (args))
+		  && SCM_NULLP (SCM_CDDR (args)),
+		  wrongnumargs);
       RETURN (SCM_SUBRF (proc) (arg1, SCM_CAR (args), SCM_CAR (SCM_CDR (args))))
     case scm_tc7_lsubr:
 #ifdef DEVAL