diff --git a/libreswan.spec b/libreswan.spec
index b1de9d0..3569a33 100644
--- a/libreswan.spec
+++ b/libreswan.spec
@@ -14,7 +14,7 @@
 %global development 0
 %global cavstests 1
 
-%global prever dr4
+#global prever dr1
 
 Name: libreswan
 Summary: IPsec implementation with IKEv1 and IKEv2 keying protocols
@@ -95,7 +95,6 @@ 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
-sed -i "s/NSS_REQ_AVA_COPY/DISABLE_REQ_AVA_COPY/" mk/config.mk
 
 %build
 %if %{buildefence}
@@ -130,6 +129,7 @@ make %{?_smp_mflags} \
   MANTREE=%{_mandir} \
   INC_RCDEFAULT=%{_initrddir} \
   WERROR_CFLAGS="" \
+  NSS_REQ_AVA_COPY=false \
   programs
 FS=$(pwd)
 
@@ -152,6 +152,22 @@ make \
   INC_RCDEFAULT=%{_initrddir} \
   INSTMANFLAGS="-m 644" \
   INITSYSTEM=systemd \
+  USE_NM=%{USE_NM} \
+  USE_XAUTHPAM=true \
+%if %{USE_FIPSCHECK}
+  USE_FIPSCHECK="%{USE_FIPSCHECK}" \
+  FIPSPRODUCTCHECK=%{_sysconfdir}/system-fips \
+%endif
+  USE_LIBCAP_NG="%{USE_LIBCAP_NG}" \
+  USE_LABELED_IPSEC="%{USE_LABELED_IPSEC}" \
+%if %{USE_CRL_FETCHING}
+  USE_LDAP=true \
+  USE_LIBCURL=true \
+%endif
+  USE_DNSSEC="%{USE_DNSSEC}" \
+  USE_SECCOMP="%{USE_SECCOMP}" \
+  WERROR_CFLAGS="" \
+  NSS_REQ_AVA_COPY=false \
   install
 FS=$(pwd)
 rm -rf %{buildroot}/usr/share/doc/libreswan
@@ -233,6 +249,9 @@ OBJ.linux.*/programs/pluto/cavp -v1psk ikev1_psk.fax | \
 %endif
 
 %changelog
+* Tue Mar 14 2017 Paul Wouters <pwouters@redhat.com> - 3.20-1
+- Updated to 3.20
+
 * 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