diff --git a/ChangeLog b/ChangeLog
index 6c7f86d4..a435d6dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Let `libtool' without arguments point to `--help' again.
+	* libltdl/config/ltmain.m4sh (func_check_version_match):
+	Remove duplicate and wrong error check.
+	* tests/help.at (standard command line options): Extend test.
+	Report by Rainer Tammer.
+
 	Avoid syntax error due to shift of nonexistent parameter.
 	* libltdl/config/ltmain.m4sh <command-line handling>: Only shift
 	if there is a positional parameter to shift.  Fixes `libtool
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 98c0a27e..32a41c7d 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -413,8 +413,6 @@ M4SH_GETOPTS(
       func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    test -z "$opt_mode" && func_fatal_error "error: you must specify a MODE."
-
     # Darwin sucks
     eval std_shrext=\"$shrext_cmds\"
 
diff --git a/tests/help.at b/tests/help.at
index 3460a2b4..e1bcbf52 100644
--- a/tests/help.at
+++ b/tests/help.at
@@ -1,6 +1,6 @@
 # help.at -- standard command line options          -*- Autotest -*-
 #
-#   Copyright (C) 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
 #
 #   This file is part of GNU Libtool.
 #
@@ -35,6 +35,10 @@ AT_CHECK([$LIBTOOL --help-all], [], [ignore])
 AT_CHECK([$LIBTOOL --version], [], [stdout])
 AT_CHECK([grep 'Copyright.*Free Software Foundation' stdout], [], [ignore])
 
+AT_CHECK([$LIBTOOL], [1], [ignore], [stderr])
+AT_CHECK([grep 'specify a MODE' stderr], [], [ignore])
+AT_CHECK([grep ' --help' stderr], [], [ignore])
+
 AT_CLEANUP