diff --git a/fix-export b/fix-export
index 65284ca5f..f99f6e840 100755
--- a/fix-export
+++ b/fix-export
@@ -20,19 +20,27 @@ autoconf
 autoheader
 automake
 (cd doc; makeinfo heimdal.texi)
-for i in krb5 hdb; do (cd lib/$i; perl ../../cf/make-proto.pl \
-	-o $i-protos.h -p $i-private.h `perl -e '
-	do { 
-		$_ = <>; 
-	} until(/lib'$i'_la_SOURCES/); 
-	while(/\\\\\s*$/s){ 
-		$_ = $_ . <>;
-	} 
-	s/\n//g; 
-	s/\\\\//g; 
-	s/.*=//; 
-	s/\s+/ /g; 
-	print;' Makefile.in`)
-done
+
+make_proto () {
+	   (top=`pwd`
+	   cd $1
+	   perl $top/cf/make-proto.pl -o $2 -p $3 `perl -e '
+		do { 
+			$_ = <>; 
+		} until(/'$i'_.*SOURCES/); 
+		while(/\\\\\s*$/s){ 
+			$_ = $_ . <>;
+		} 
+		s/\n//g; 
+		s/\\\\//g; 
+		s/.*=//; 
+		s/\s+/ /g; 
+		print;' Makefile.in`)
+}
+
+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
+
 rm fix-export make-release make-release.el
 find . -name .cvsignore -print | xargs rm