diff --git a/.gitignore b/.gitignore
index f5cb6c3..9d4f596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /libreswan-3.17.tar.gz
 /libreswan-3.18.tar.gz
 /libreswan-3.19.tar.gz
+/libreswan-3.20dr4.tar.gz
diff --git a/libreswan.spec b/libreswan.spec
index 25668ed..b1de9d0 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -14,12 +14,12 @@
 %global development 0
 %global cavstests 1
 
-#global prever rc1
+%global prever dr4
 
 Name: libreswan
 Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols
-Version: 3.19
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
+Version: 3.20
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 License: GPLv2
 Url: https://libreswan.org/
 Source0: https://download.libreswan.org/%{?prever:development/}%{name}-%{version}%{?prever}.tar.gz
@@ -28,11 +28,6 @@ Source1: https://download.libreswan.org/cavs/ikev1_dsa.fax.bz2
 Source2: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2
 Source3: https://download.libreswan.org/cavs/ikev2.fax.bz2
 
-Patch1: libreswan-3.19-configdir-compat.patch
-Patch2: libreswan-3.19-testbuf.patch
-Patch3: libreswan-3.19-uniqueid_replace.patch
-Patch4: libreswan-3.19-suppress_delete.patch
-
 %endif
 Group: System Environment/Daemons
 BuildRequires: bison flex pkgconfig
@@ -100,11 +95,7 @@ Libreswan is based on Openswan-2.6.38 which in turn is based on FreeS/WAN-2.04
 %prep
 %setup -q -n libreswan-%{version}%{?prever}
 sed -i "s:/usr/bin/python:/usr/bin/python3:" programs/verify/verify.in
-
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+sed -i "s/NSS_REQ_AVA_COPY/DISABLE_REQ_AVA_COPY/" mk/config.mk
 
 %build
 %if %{buildefence}
@@ -242,6 +233,9 @@ OBJ.linux.*/programs/pluto/cavp -v1psk ikev1_psk.fax | \
 %endif
 
 %changelog
+* Fri Mar 03 2017 Paul Wouters <pwouters@redhat.com> - 3.20-0.1.dr4
+- Update to 3.20dr4 to test mozbz#1336487 export CERT_CompareAVA
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.19-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index c7af9e2..19d79d6 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-SHA512 (ikev1_dsa.fax.bz2) = 627cbac14248bd68e8d22fbca247668a7749ef0c2e41df8d776d62df9a21403d3a246c0bd82c3faedce62de90b9f91a87f753e17b056319000bba7d2038461ac
-SHA512 (ikev1_psk.fax.bz2) = 1b2daec32edc56b410c036db2688c92548a9bd9914994bc7e555b301dd6db4497a6b3e89dc12ddf36826ae90b40fcde501a5a45c0d59098e07839073d219d467
-SHA512 (ikev2.fax.bz2) = 0d3748d1bd574f6f1f3e4db847eca126ce649566ea710ef227426f433122752b80d1d6b8acf9d0df07b5597c1e45447e3a2fcb3391756e834e8e75f99df8e51e
-SHA512 (libreswan-3.19.tar.gz) = fdd8fa33cd0da4c8dd2be86a5689316668041b3788b918c243a0f36f149876b14d13b3115aa203cee3885db95760bde16bee60e701e7027e412299dc2321b233
+SHA512 (libreswan-3.20dr4.tar.gz) = cea3bfcc67add094ecfcb7b692d3394203bb3615b5f4178f52272214e5f571240044e099d0b1b6aa002fd4dcaa606ac55d5942913984069e7d3556708d5ab242