diff --git a/net-snmp.spec b/net-snmp.spec
index b313bd6..3189c1d 100644
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -3,7 +3,7 @@
 Summary: A collection of SNMP protocol tools and libraries.
 Name: net-snmp
 Version: 5.1.1
-Release: 2
+Release: 3
 License: BSDish
 Group: System Environment/Daemons
 Source0: ftp://net-snmp.sourceforge.net/net-snmp-%{version}.tar.gz
@@ -189,23 +189,32 @@ ln -s snmptrap ${RPM_BUILD_ROOT}/usr/bin/snmpinform
 cp local/mib2c.*.conf ${RPM_BUILD_ROOT}%{_datadir}/snmp
 
 pushd perl
-make PREFIX=${RPM_BUILD_ROOT}/%{_prefix} install_vendor
-eval $(perl '-V:installvendorlib')
+make install_vendor
+eval $(perl '-V:installvendorarch')
 
 # Urgs, what an evil hack. Brrr.
-%if "%{_libdir}" == "/usr/lib64"
-installvendorlib=`echo $installvendorlib | sed 's/lib/lib64/'`
-%endif
+#%if "%{_libdir}" == "/usr/lib64"
+#installvendorarch=`echo $installvendorarch | sed 's/lib/lib64/'`
+#%endif
 
-find $RPM_BUILD_ROOT%{_libdir} -name Makefile.subs.pl | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir} -name perllocal.pod | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir} -name .packlist | xargs rm -f
+# remove special files
+find $RPM_BUILD_ROOT -name perllocal.pod \
+	-o -name .packlist \
+	-o -name "*.bs" \
+	-o -name Makefile.subs.pl \
+	| xargs -ri rm -f {}
 
-find $RPM_BUILD_ROOT/$installvendorlib -type f -print \
-        -o -type d -a \
-        -name NetSNMP -printf '%%%%dir %%p\n' \
-        -o -name SNMP -printf '%%%%dir %%p\n' | \
-        sed "s@$RPM_BUILD_ROOT@@g" > ../perl.lst
+# no empty directories
+find $RPM_BUILD_ROOT/$installvendorarch \
+	-depth -type d -a -empty -exec rmdir {} \;
+
+# build files list
+find $RPM_BUILD_ROOT/$installvendorarch -type f -print \
+	-o -type d -a -printf '%%%%dir %%p\n' \
+	| sed "s@$RPM_BUILD_ROOT@@g" \
+	| grep -v "$installvendorarch\$" \
+	| grep -v '/auto$' \
+	> ../perl.lst
 popd
 find $RPM_BUILD_ROOT -name '*.so' | xargs chmod 0755
 
@@ -276,6 +285,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %attr(0644,root,root)   %{_mandir}/man3/*.3pm.*
 
 %changelog
+* Thu May 06 2004 Phil Knirsch <pknirsch@redhat.com> 5.1.1-3
+- Reworked the perl filelist stuff (Thanks to marius feraru).
+
 * Thu Apr 08 2004 Phil Knirsch <pknirsch@redhat.com> 5.1.1-2
 - Added Kaj J. Niemi that fixes ipAdEntIfIndex problem (#119106)
 - Added Kaj J. Niemi to shut up memshared message for 2.6 kernel (#119203)