diff --git a/projects/gnupg/Dockerfile b/projects/gnupg/Dockerfile
index 34de6a1e7..02bc37ee5 100644
--- a/projects/gnupg/Dockerfile
+++ b/projects/gnupg/Dockerfile
@@ -16,14 +16,13 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER p.antoine@catenacyber.fr
-RUN apt-get update && apt-get install -y make autoconf automake libtool gettext bzip2 gnupg
+RUN apt-get update && apt-get install -y make autoconf automake libtool gettext bzip2 gnupg bison flex
 
-#wait for zesty, or backport ?
-RUN curl -O https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.32.tar.bz2
-RUN curl -O https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.2.tar.bz2
-RUN curl -O https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2
-RUN curl -O https://www.gnupg.org/ftp/gcrypt/libksba/libksba-1.3.5.tar.bz2
-RUN curl -O https://www.gnupg.org/ftp/gcrypt/npth/npth-1.5.tar.bz2
+RUN git clone --depth 1 git://git.gnupg.org/libgpg-error.git libgpg-error
+RUN git clone --depth 1 git://git.gnupg.org/libgcrypt.git libgcrypt
+RUN git clone --depth 1 git://git.gnupg.org/libassuan.git libassuan
+RUN git clone --depth 1 git://git.gnupg.org/libksba.git libksba
+RUN git clone --depth 1 git://git.gnupg.org/npth.git npth
 
 RUN git clone --depth 1 git://git.gnupg.org/gnupg.git gnupg
 
diff --git a/projects/gnupg/build.sh b/projects/gnupg/build.sh
index 7f338ac39..85927d05f 100755
--- a/projects/gnupg/build.sh
+++ b/projects/gnupg/build.sh
@@ -17,33 +17,33 @@
 
 #compile and link statically dependencies
 cd ..
-tar -xvf libgpg-error-1.32.tar.bz2
-cd libgpg-error-1.32
-./configure --enable-static --disable-shared
+cd libgpg-error
+./autogen.sh
+./configure --disable-doc --enable-static --disable-shared
 make
 make install
 cd ..
-tar -xvf libgcrypt-1.8.2.tar.bz2
-cd libgcrypt-1.8.2
-./configure --enable-static --disable-shared
+cd libgcrypt
+./autogen.sh
+./configure --disable-doc --enable-static --disable-shared
 make
 make install
 cd ..
-tar -xvf libassuan-2.5.1.tar.bz2
-cd libassuan-2.5.1
-./configure --enable-static --disable-shared
+cd libassuan
+./autogen.sh
+./configure --disable-doc --enable-static --disable-shared
 make
 make install
 cd ..
-tar -xvf libksba-1.3.5.tar.bz2
-cd libksba-1.3.5
-./configure --enable-static --disable-shared
+cd libksba
+./autogen.sh
+./configure --disable-doc --enable-static --disable-shared
 make
 make install
 cd ..
-tar -xvf npth-1.5.tar.bz2
-cd npth-1.5
-./configure --enable-static --disable-shared
+cd npth
+./autogen.sh
+./configure --disable-doc --enable-static --disable-shared
 make
 make install
 cd ..