diff --git a/ChangeLog b/ChangeLog
index 81538c16..1036c9aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-22  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+	* doc/autoconf.texi (Limitations of Make): Mention the special
+	handling of the obj/ directory by BSD make.
+
 2002-07-20  Kevin Ryde  <user42@zip.com.au>
 
 	* doc/autoconf.texi (Limitations of Make): Add HP-UX IA-64 trailing
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 3fea6e8d..74986f87 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -10395,6 +10395,31 @@ all:
         # foo
 @end example
 
+@item The @file{obj/} subdirectory.
+@cindex @file{obj/}, subdirectory
+@cindex BSD make and @file{obj/}
+
+Never name one of your subdirectories @file{obj/} if you don't like
+surprises.
+
+If an @file{obj/} directory exists, BSD make will enter it
+before reading @file{Makefile}.  Hence the @file{Makefile} in the
+current directory will not be read.
+
+@example
+% @kbd{cat Makefile}
+all:
+        echo Hello
+% @kbd{cat obj/Makefile}
+all:
+        echo World
+% @kbd{make}      # GNU make
+echo Hello
+Hello
+% @kbd{pmake}     # BSD make
+echo World
+World
+@end example
 
 @item @code{VPATH}
 @cindex @code{VPATH}