diff --git a/ChangeLog b/ChangeLog
index 65d19ad4c45..b3c3b374c7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-07  Phil Edwards  <pme@sourceware.cygnus.com>
+
+	* symlink-tree:  Check number of arguments.
+
 2000-07-05  Jim Wilson  <wilson@cygnus.com>
 
 	* Makefile.in (CXX_FOR_TARGET): Add libstdc++ to the library
diff --git a/symlink-tree b/symlink-tree
index 096582db6eb..8f11c087932 100755
--- a/symlink-tree
+++ b/symlink-tree
@@ -10,6 +10,11 @@ prog=$0
 srcdir=$1
 ignore="$2"
 
+if test $# -lt 1; then
+  echo "symlink-tree error:  Usage: symlink-tree srcdir \"ignore1 ignore2 ...\""
+  exit 1
+fi
+
 ignore_additional=". .. CVS"
 
 # If we were invoked with a relative path name, adjust ${prog} to work