diff --git a/fix-export b/fix-export
index 39881bb25..f925e4ada 100755
--- a/fix-export
+++ b/fix-export
@@ -47,26 +47,17 @@ find . -name Makefile.am | while read f; do
 done
 
 make_proto () {
-	   (top=`pwd`
-	   cd $1
-	   b=`basename $1`
-	   perl $top/cf/make-proto.pl -o $2 -p $3 `perl -e '
-		do { 
-			$_ = <>; 
-		} until(/'$b'_.*SOURCES/); 
-		while(/\\\\\s*$/s){ 
-			$_ = $_ . <>;
-		} 
-		s/\n//g; 
-		s/\\\\//g; 
-		s/.*=//; 
-		s/\s+/ /g; 
-		print;' Makefile.in`)
+	(top=`pwd`
+	cd $1
+	b=`basename $1`
+	perl $top/cf/make-proto.pl -o $2 -p $3 `(sed 's/^include/##include/' Makefile.am; 
+		echo 'print-sources:; @if test "$(proto_opts)"; then echo $(proto_opts); else echo -q -P comment; fi; echo '$4 | sort -u ) | make -f - print-sources `)
 }
 
-make_proto lib/krb5 krb5-protos.h krb5-private.h
-make_proto lib/hdb hdb-protos.h hdb-private.h
-make_proto appl/login login_protos.h /dev/null
+make_proto lib/krb5 krb5-protos.h krb5-private.h '$(libkrb5_la_SOURCES)'
+make_proto lib/kadm5 kadm5-protos.h kadm5-private.h '$(libkadm5srv_la_SOURCES) $(libkadm5clnt_la_SOURCES)'
+ake_proto lib/hdb hdb-protos.h hdb-private.h '$(libhdb_la_SOURCES)'
+make_proto appl/login login_protos.h /dev/null '$(login_SOURCES)'
 
 rm fix-export make-release make-release.el
 find . -name .cvsignore -print | xargs rm