diff --git a/dist.sh b/dist.sh
index 27bd40a..7d1ac9f 100755
--- a/dist.sh
+++ b/dist.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 
-rm -f man/*.1 man/*.3
 ./autogen.sh
-./configure --enable-libtls
+./configure
 make distcheck
diff --git a/client.patch b/patches/client.patch
similarity index 100%
rename from client.patch
rename to patches/client.patch
diff --git a/config.patch b/patches/config.patch
similarity index 100%
rename from config.patch
rename to patches/config.patch
diff --git a/compat/imsg.patch b/patches/imsg.patch
similarity index 100%
rename from compat/imsg.patch
rename to patches/imsg.patch
diff --git a/ntp.patch b/patches/ntp.patch
similarity index 100%
rename from ntp.patch
rename to patches/ntp.patch
diff --git a/ntpd.patch b/patches/ntpd.patch
similarity index 100%
rename from ntpd.patch
rename to patches/ntpd.patch
diff --git a/parse.patch b/patches/parse.patch
similarity index 100%
rename from parse.patch
rename to patches/parse.patch
diff --git a/server.patch b/patches/server.patch
similarity index 100%
rename from server.patch
rename to patches/server.patch
diff --git a/util.patch b/patches/util.patch
similarity index 100%
rename from util.patch
rename to patches/util.patch
diff --git a/update.sh b/update.sh
index b6b18e4..c9f5b04 100755
--- a/update.sh
+++ b/update.sh
@@ -18,6 +18,7 @@ fi
 
 # setup source paths
 dir=`pwd`
+patches=$dir/patches
 libc_inc=$dir/openbsd/src/include
 libc_src=$dir/openbsd/src/lib/libc
 libcrypto_src=$dir/openbsd/src/lib/libcrypto
@@ -32,7 +33,7 @@ cp $libc_inc/sha2.h include/sha2_openbsd.h
 cp $libutil_src/imsg.h include/
 cp $libutil_src/imsg.c compat/
 cp $libutil_src/imsg-buffer.c compat/
-(cd compat; $PATCH < imsg.patch)
+(cd compat; $PATCH < $patches/imsg.patch)
 
 for i in explicit_bzero.c strlcpy.c strlcat.c strndup.c strnlen.c; do
 	$CP $libc_src/string/$i compat
@@ -55,10 +56,10 @@ for i in client.c config.c control.c log.c ntp.c ntp.h ntp_dns.c ntp_msg.c \
 	echo Copying `basename $i`
 	$CP $ntpd_src/$i .
 done
-$PATCH < client.patch
-$PATCH < config.patch
-$PATCH < ntp.patch
-$PATCH < ntpd.patch
-$PATCH < parse.patch
-$PATCH < server.patch
-$PATCH < util.patch
+$PATCH < $patches/client.patch
+$PATCH < $patches/config.patch
+$PATCH < $patches/ntp.patch
+$PATCH < $patches/ntpd.patch
+$PATCH < $patches/parse.patch
+$PATCH < $patches/server.patch
+$PATCH < $patches/util.patch