diff --git a/apr-util-1.3.4.tar.bz2.asc b/apr-util-1.3.4.tar.bz2.asc
deleted file mode 100644
index 0791831..0000000
--- a/apr-util-1.3.4.tar.bz2.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iQIVAwUASKPDgYFUZ7bLm57FAQLWUQ/+NcCpkXJ8+3joda1aChkCPmFfV7AKbJ6v
-+orAxp2kDV1TQxcL6YZLIzLsKK+kdk5R4XX0gC95YfVCutNjBmXKwhGbTHYDG+6t
-pqgnd0rcMxm8xGstE8Q9bRqBfgmjMNVXLSf9Fwo80cEc1bxBmerZ0DGIAD/P08GO
-87/JOGbiwQti2izzYqj4xeMz1b+ZSOM/eEiwVJrEcR7eCOOTN2mQ4bHbIijxdwBP
-yUhxXI5sYQbcbOTMA+sIkSjEDq+xo6aJsjA+EE34/7eW5GVx4nnJs/9B0Sy5LGL8
-pkj2YAGZaGks0dsCGfq2FP0ybwhebgxhut7jLQCd4iU8dUWZjUEauuOBVdChlgq8
-akqkJS/9rWJh4cboDqqYko7cESDFR4qw7uBN2rrojpcIlIfG9iQzNMEHkWKd6Fhe
-NoJ/6s1EWDXJ4TIARcoTMvRSYSFkL1O87yO3wrNogC4NHKgzfh6GmEDUqimvCTRN
-CAj5NXFhx4FC9eLB0fWwPUVI1W/A4hOFy0uk6eaWoAzhm85SifJDZbgkUiiFgmBh
-6iBqgCLuiyAbaE8pwEUlVlv9idmP0YPzIhcUsIoXw7ZhyI3BItKrGTIv2cDDuq9d
-W1LEdCrzvEE1YmzS0cV6XzR+9Fq3FCGinR5+s0vBhQmCnlyEECjci3YcepdGLVyw
-lBNStwOSf1k=
-=zf2I
------END PGP SIGNATURE-----
diff --git a/apr-util-1.3.7.tar.bz2.asc b/apr-util-1.3.7.tar.bz2.asc
new file mode 100644
index 0000000..d2e7586
--- /dev/null
+++ b/apr-util-1.3.7.tar.bz2.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAABAgAGBQJKJqCqAAoJEIFUZ7bLm57FOOkP/0Fj2veY0Vlai34BCGrJeFPV
+X13u0Q+rtMMejO58z+ZEE8Su5bmkpfQE+oZNMsM30KTzUh18g614/0O2dR23PW7H
+eHGNp2m9mcHH+9PQNM+/Q5RYLX23bIWpLHQI2oR/cM0YbgHaozLeM/wGBVdnfAWw
+pfR1LML4V/2PwkD60STyTcDwW1NR1axQhCsbhuHSCWiLteRbWACPQ6CeukIzONFh
+gM1dBJtLAlGEewDETJ3hHvGfh2Fzf7BIo9ETrgX7uFoM6FpmPii5WAryDsKbB3AF
+u6XrHCnvF0Z/iBJOEmShpZ3388DmsSaTsKKx9NFzpVEoU+nS+px7OHjEo4q/8GpX
+Pm4f3ou79rL0A4VEPE0zmiMQjK19X6KlZ7yYudXfksFMaa7+Zri+L1/oklUsyaQw
+G3oJYRoGAR/I/p+aGb5Qx3fohylrIhBeR4mZzkGIQw9ErK1d7fJoIe3BMHLy3PzX
+zse+KQPCyNRfi6IABAxH+bPIj48RlW6E6cicwM0n/83OS/A+0VUVfOJFp0UL02QK
+viODptk50wMbyF3FNxOdGiHNWt1yoqztjiLAmeIefTOSeuk4LkvlFo4Srga2lw1K
+KNyRJyZ34Qof33Gc1S0wPiASevnmYSgd0/UlAK3B2dBVFcIoRLroTJ91zW3dm1Ym
+BO5qa8TwrJlAcGPHkSoM
+=jEyS
+-----END PGP SIGNATURE-----
diff --git a/apr-util.spec b/apr-util.spec
index b0b80f1..2bfedd8 100644
--- a/apr-util.spec
+++ b/apr-util.spec
@@ -3,8 +3,8 @@
 
 Summary: Apache Portable Runtime Utility library
 Name: apr-util
-Version: 1.3.4
-Release: 3%{?dist}
+Version: 1.3.7
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Libraries
 URL: http://apr.apache.org/
@@ -95,6 +95,9 @@ This package provides the LDAP support for the apr-util.
 %setup -q
 %patch1 -p1 -b .pkgconf
 
+# Our apr.h file is arch specific
+sed -i -e 's,apr_h=\(.*\)/apr.h",apr_h=\1/apr-%{_arch}.h",' build/dso.m4
+
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
@@ -134,6 +137,7 @@ export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 cd test
 make %{?_smp_mflags} testall
 # testall breaks with DBD DSO; ignore
+export LD_LIBRARY_PATH="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$LD_LIBRARY_PATH" | sed -e 's/::*$//'`"
 ./testall -v -q || true
 ./testall testrmm
 ./testall testdbm
@@ -149,6 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
+%{_libdir}/apr-util-%{apuver}/apr_dbm*
 %dir %{_libdir}/apr-util-%{apuver}
 
 %files pgsql
@@ -185,6 +190,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*.m4
 
 %changelog
+* Mon Jun  8 2009 Bojan Smojver <bojan@rexursive.com> - 1.3.7-1
+- bump up to 1.3.7
+- CVE-2009-0023
+- "billion laughs" fix of apr_xml_* interface
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index f811f80..8efe8c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-adfbe525cf3914cf769340e8f6a6d14b  apr-util-1.3.4.tar.bz2
+2ed3ae6734290296faa193e1177d50e6  apr-util-1.3.7.tar.bz2