diff --git a/projects/ntp/Dockerfile b/projects/ntp/Dockerfile
index db593ea0d..6b66d899c 100644
--- a/projects/ntp/Dockerfile
+++ b/projects/ntp/Dockerfile
@@ -16,8 +16,9 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER security@ntp.org
-RUN apt-get update && apt-get install -y make autoconf automake libtool bison flex
+RUN apt-get update && apt-get install -y make autoconf automake libtool bison flex rsync lynx
 #TODO use bitkeeper repo from http://bk.ntp.org
+#or wait for update of RUN rsync -a archive.ntp.org::ntp-dev-src ntp-dev-src
 ADD http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ntp-dev-4.3.99.tar.gz ntp-dev.tar.gz
 WORKDIR $SRC
 COPY build.sh $SRC/
diff --git a/projects/ntp/build.sh b/projects/ntp/build.sh
index 86c29a4cd..d4a2c03df 100755
--- a/projects/ntp/build.sh
+++ b/projects/ntp/build.sh
@@ -18,7 +18,9 @@
 tar -xvf ntp-dev.tar.gz
 cd ntp-dev-4.3.99
 git apply ../patch.diff
-autoreconf -i
+#avoids https://bugs.llvm.org/show_bug.cgi?id=34636
+cp /usr/bin/ld.gold /usr/bin/ld
+./bootstrap
 ./configure --enable-fuzztargets
 make
 cp tests/fuzz/fuzz_ntpd_receive $OUT/