-%{perl_vendorarch}/Apache/*.pm
-%dir %{perl_vendorarch}/auto/Apache/Cookie
-%dir %{perl_vendorarch}/auto/Apache/Request
-%{perl_vendorarch}/auto/Apache/Cookie/Cookie.bs
-%{perl_vendorarch}/auto/Apache/Request/Request.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/Apache/Cookie/Cookie.so
-%attr(755,root,root) %{perl_vendorarch}/auto/Apache/Request/Request.so
+%{perl_vendorarch}/Apache2/*.pm
+%{perl_vendorarch}/APR/*.pm
+%dir %{perl_vendorarch}/APR/Request
+%{perl_vendorarch}/APR/Request/*.pm
+%dir %{perl_vendorarch}/auto/APR/Request
+%dir %{perl_vendorarch}/auto/APR/Request/Apache2
+%dir %{perl_vendorarch}/auto/APR/Request/CGI
+%dir %{perl_vendorarch}/auto/APR/Request/Cookie
+%dir %{perl_vendorarch}/auto/APR/Request/Error
+%dir %{perl_vendorarch}/auto/APR/Request/Hook
+%dir %{perl_vendorarch}/auto/APR/Request/Param
+%dir %{perl_vendorarch}/auto/APR/Request/Parser
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/Request/*.so
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/Request/*/*.so
+
+# TODO: generate these manually; Makefile.PL (and overall logic) is broken