diff --git a/ChangeLog b/ChangeLog
index ce8b944d..2559b550 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-31  Akim Demaille  <akim@epita.fr>
+
+	* bin/autom4te.in (load_configuration): Reject #args out of any
+	language.
+
 2002-10-31  Akim Demaille  <akim@epita.fr>
 
 	* lib/autoconf/general.m4 (_AC_MSG_LOG_CONFTEST): New.
diff --git a/bin/autom4te.in b/bin/autom4te.in
index c8639bf7..2b4ca03f 100644
--- a/bin/autom4te.in
+++ b/bin/autom4te.in
@@ -465,15 +465,20 @@ sub load_configuration ($)
       my $type = shift @words;
       if ($type eq 'begin-language:')
 	{
+	  error "$file:$.: end-language missing for: $lang"
+	    if defined $lang;
 	  $lang = lc $words[0];
 	}
       elsif ($type eq 'end-language:')
 	{
 	  error "$file:$.: end-language mismatch: $lang"
 	    if $lang ne lc $words[0];
+	  $lang = undef;
 	}
       elsif ($type eq 'args:')
 	{
+	  error "$file:$.: no current language"
+	    unless defined $lang;
 	  push @{$language{$lang}}, @words;
 	}
       else