diff --git a/tools/build/ChangeLog b/tools/build/ChangeLog
index 97220c04e1..740e684c72 100644
--- a/tools/build/ChangeLog
+++ b/tools/build/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-24	Ralf Corsepius <ralf.corsepius@rtems.org>
+
+	* ampolish3.in: Use @PERL@, partial update from local sources.
+
 2005-10-24	Ralf Corsepius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Add ampolish3.
diff --git a/tools/build/ampolish3.in b/tools/build/ampolish3.in
index b65e649255..eb46800d8a 100755
--- a/tools/build/ampolish3.in
+++ b/tools/build/ampolish3.in
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#! @PERL@ -w
 
 # Helper script to generate pre/tmpinstall rules for cpukit Makefile.am.
 #
@@ -68,7 +68,7 @@ foreach my $l ( @buffer1 ) {
     $dirmap{"\$\($1\)"} = replace($2);
   } elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o )
   { #ignore: noinst_* are not relevant here.
-  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)(include)_(HEADERS)\s*\=(.*)/o )
+  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)(include|lib)_(HEADERS|LIBRARIES)\s*\=(.*)/o )
   {
     push @buffer2, "$3dir = \$($3dir)\n";
     push @buffer2, "$l";