diff --git a/ChangeLog b/ChangeLog
index feb6bf9e7..f1ab490e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-10-25  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
+
+	Integrated libguile-ltdl/ from HEAD branch.
+
+	* configure.in: Do not call AC_LTDL_INSTALLABLE and do not recurse
+	into libltdl subdirectory.  Call AC_LIB_LTDL.  Do not substitute
+	INCLLTDL and LIBLTDL, they are not needed.  Create
+	libguile-ltdl/Makefile.am and libguile-ltdl/upstream/Makefile.am.
+	* libguile-ltdl/: Copied from HEAD branch.
+	* autogen.sh: Do not populate libltdl/ directory. 
+	* Makefile.am (SUBDIRS): Use libguile-ltdl instead of libltdl.
+
 2002-09-04  Rob Browning  <rlb@defaultvalue.org>
 
 	* Guile 1.6.0 released.
diff --git a/Makefile.am b/Makefile.am
index d41a50968..d5a0331d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 AUTOMAKE_OPTIONS = 1.5
 
-SUBDIRS = oop qt libltdl libguile ice-9 guile-config guile-readline \
+SUBDIRS = oop qt libguile-ltdl libguile ice-9 guile-config guile-readline \
 	  scripts srfi doc examples test-suite am
 
 bin_SCRIPTS = guile-tools
diff --git a/autogen.sh b/autogen.sh
index f1d987082..9f7c046c0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -44,41 +44,7 @@ $mscripts/render-bugs > BUGS
 ### Libtool setup.
 
 # Get a clean version.
-rm -rf libltdl
-libtoolize --force --copy --automake --ltdl
-
-# Make sure we use a ./configure.in compatible autoconf in ./libltdl/
-mv libltdl/configure.in libltdl/configure.tmp
-echo 'AC_PREREQ(2.50)' > libltdl/configure.in
-cat libltdl/configure.tmp >> libltdl/configure.in
-rm libltdl/configure.tmp
-
-# Maybe patch ltdl.c.  This is only needed for 1.4.2 and earlier.
-if patch libltdl/ltdl.c <<EOP
---- ltdl.c~	Fri Apr 12 18:52:48 2002
-+++ ltdl.c	Tue Jul  9 14:12:47 2002
-@@ -2246,15 +2246,15 @@
- static int
- find_handle_callback (filename, data, ignored)
-      char *filename;
-      lt_ptr data;
-      lt_ptr ignored;
- {
-   lt_dlhandle  *handle	= (lt_dlhandle *) data;
--  int		found	= access (filename, R_OK);
-+  int		found	= !access (filename, F_OK);
- 
-   /* Bail out if file cannot be read...  */
-   if (!found)
-     return 0;
- 
-   /* Try to dlopen the file, but do not continue searching in any
-      case.  */
-EOP
-then true
-else
-   echo "WARNING: could not patch libltdl, but this is probably OK."
-fi
+libtoolize --force --copy --automake
 
 ######################################################################
 
@@ -92,12 +58,6 @@ autoconf
 automake --add-missing
 automake --add-missing
 
-# Make sure that libltdl uses the same autoconf version as the rest.
-#
-echo "libltdl..."
-(cd libltdl && autoconf)
-(cd libltdl && automake --gnu --add-missing)
-
 echo "guile-readline..."
 (cd guile-readline && ./autogen.sh)
 
diff --git a/configure.in b/configure.in
index df747f2a4..9b4c2273b 100644
--- a/configure.in
+++ b/configure.in
@@ -143,9 +143,6 @@ AC_DEFINE(READER_EXTENSIONS, 1,
 
 #--------------------------------------------------------------------
 
-AC_LIBLTDL_INSTALLABLE
-AC_CONFIG_SUBDIRS(libltdl)
-
 AC_PROG_CC
 AC_PROG_CPP
 AC_LIBTOOL_DLOPEN
@@ -156,6 +153,7 @@ AC_MINIX
 
 AM_PROG_CC_STDC
 AM_PROG_LIBTOOL
+AC_LIB_LTDL
 
 AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
 AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
@@ -260,8 +258,11 @@ if test "$use_modules" != no; then
     done
   fi
 fi
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
+
+# FIXME: check to see if we still need these.
+#AC_SUBST(INCLTDL)
+#AC_SUBST(LIBLTDL)
+
 AC_SUBST(DLPREOPEN)
 
 AC_CHECK_FUNCS(ctermid ftime fchown getcwd geteuid gettimeofday lstat mkdir mknod nice readlink rename rmdir select setegid seteuid setlocale setpgid setsid sigaction siginterrupt strftime strptime symlink sync tcgetpgrp tcsetpgrp times uname waitpid strdup system usleep atexit on_exit chown link fcntl ttyname getpwent getgrent kill getppid getpgrp fork setitimer getitimer)
@@ -699,6 +700,8 @@ AC_CONFIG_FILES([
   libguile/guile-func-name-check
   libguile/guile-snarf-docs
   libguile/version.h
+  libguile-ltdl/Makefile
+  libguile-ltdl/upstream/Makefile
   ice-9/Makefile
   oop/Makefile
   oop/goops/Makefile