diff --git a/ChangeLog b/ChangeLog
index bade599c..aef5ad4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-19  Gary V. Vaughan  <gary@gnu.org>
+
+	* libtoolize.m4sh: Handle argz.m4 specially like ltdl.m4, so
+	that it isn't copied unless libltdl is being used.  Copy other
+	macro files according to their tagged serial numbers.
+	* tests/libtoolize.at: Adjust.
+
 2007-03-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* tests/mdemo/Makefile.am (libmlib_la_LDFLAGS): Add
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index 7b7f7a5e..7ab34301 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1114,13 +1114,20 @@ func_nonemptydir_p ()
     func_verbose "AC_CONFIG_AUX_DIR not defined, not copying libtool auxiliary files."
   fi
 
-  # libtool.m4 and ltdl.m4 were handled specially above
-  func_massage_aclocal_DATA 'libtool.m4|ltdl.m4'
+  # argz.m4, libtool.m4 and ltdl.m4 were handled specially above
+  func_massage_aclocal_DATA 'argz.m4|libtool.m4|ltdl.m4'
 
-  # Copy libtool's m4 macros to the macro directory, if they are newer.
+  # Copy libtool's m4 macros to the macro directory, if they are newer
+  # (keep these in alphabetical order to maintain sanity in testsuite):
   if test -n "$m4dir"; then
     $opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR, \`$m4dir'."
 
+    if $seen_ltdl; then
+      func_serial_update argz.m4 "$aclocaldir" "$m4dir" argz.m4
+    else
+      func_verbose "Not copying \`$m4dir/argz.m4', libltdl not used."
+    fi
+
     func_serial_update  libtool.m4 "$aclocaldir" "$m4dir" \
       LT_INIT 'A[CM]_PROG_LIBTOOL'
 
@@ -1159,7 +1166,7 @@ func_nonemptydir_p ()
     # Unless we share CONFIG_MACRO_DIR with our parent project,
     # copy macros here.
     if test "${ltdlprefix}m4" != "$m4dir"; then
-      func_copy_some_files "$pkgmacro_files:libtool.m4:ltdl.m4" \
+      func_copy_some_files "argz.m4:libtool.m4:ltdl.m4:$pkgmacro_files" \
         "$aclocaldir" "${ltdlprefix}m4"
     fi
 
diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index d7e57789..68b79b4d 100644
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -79,7 +79,6 @@ AT_DATA(expout,
 libtoolize: copying file `config/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
@@ -109,7 +108,6 @@ AT_DATA(expout,
 [[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
 libtoolize: copying file `m4/lt~obsolete.m4'
@@ -131,7 +129,6 @@ AT_DATA(expout,
 [[libtoolize: putting files in AC_CONFIG_AUX_DIR, `config'.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: `m4/ltsugar.m4' is already up to date.
 libtoolize: `m4/ltversion.m4' is already up to date.
 libtoolize: `m4/lt~obsolete.m4' is already up to date.
@@ -154,7 +151,6 @@ AT_DATA(expout,
 libtoolize: copying file `config/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
@@ -173,7 +169,6 @@ AT_DATA(expout,
 libtoolize: `config/ltmain.sh' is already up to date.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: `m4/ltoptions.m4' is already up to date.
 libtoolize: `m4/ltsugar.m4' is already up to date.
 libtoolize: `m4/ltversion.m4' is already up to date.
@@ -207,7 +202,6 @@ libtoolize: copying file `config/config.sub'
 libtoolize: copying file `config/install-sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
 libtoolize: copying file `m4/lt~obsolete.m4'
@@ -232,7 +226,6 @@ libtoolize: `config/config.sub' is already up to date.
 libtoolize: `config/install-sh' is already up to date.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: `m4/ltsugar.m4' is already up to date.
 libtoolize: `m4/ltversion.m4' is already up to date.
 libtoolize: `m4/lt~obsolete.m4' is already up to date.
@@ -258,7 +251,6 @@ libtoolize: copying file `config/install-sh'
 libtoolize: copying file `config/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'
@@ -280,7 +272,6 @@ libtoolize: `config/install-sh' is already up to date.
 libtoolize: `config/ltmain.sh' is already up to date.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: `m4/libtool.m4' is already up to date.
-libtoolize: `m4/argz.m4' is already up to date.
 libtoolize: `m4/ltoptions.m4' is already up to date.
 libtoolize: `m4/ltsugar.m4' is already up to date.
 libtoolize: `m4/ltversion.m4' is already up to date.
@@ -309,9 +300,9 @@ AC_OUTPUT
 
 AT_DATA(expout,
 [[libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `ltdl/m4'.
+libtoolize: linking file `ltdl/m4/argz.m4'
 libtoolize: linking file `ltdl/m4/libtool.m4'
 libtoolize: linking file `ltdl/m4/ltdl.m4'
-libtoolize: linking file `ltdl/m4/argz.m4'
 libtoolize: linking file `ltdl/m4/ltoptions.m4'
 libtoolize: linking file `ltdl/m4/ltsugar.m4'
 libtoolize: linking file `ltdl/m4/ltversion.m4'
@@ -421,8 +412,6 @@ AT_DATA([expout],
 libtoolize: `config/ltmain.sh' is already up to date.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
-libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: You should add the contents of `m4/ltsugar.m4' to `aclocal.m4'.
@@ -459,8 +448,6 @@ AT_DATA([expout],
 libtoolize: `config/ltmain.sh' is already up to date.
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: `m4/argz.m4' is already up to date.
-libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
 libtoolize: `m4/ltsugar.m4' is already up to date.
 libtoolize: `m4/ltversion.m4' is already up to date.
 libtoolize: `m4/lt~obsolete.m4' is already up to date.
@@ -482,8 +469,6 @@ AT_DATA(expout,
 libtoolize: copying file `config/ltmain.sh'
 libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
 libtoolize: copying file `m4/libtool.m4'
-libtoolize: copying file `m4/argz.m4'
-libtoolize: You should add the contents of `m4/argz.m4' to `aclocal.m4'.
 libtoolize: copying file `m4/ltoptions.m4'
 libtoolize: copying file `m4/ltsugar.m4'
 libtoolize: copying file `m4/ltversion.m4'