diff --git a/projects/xpdf/Dockerfile b/projects/xpdf/Dockerfile
index 4413a4933..3c88d22e9 100755
--- a/projects/xpdf/Dockerfile
+++ b/projects/xpdf/Dockerfile
@@ -17,7 +17,7 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER david@adalogics.com
 RUN apt-get update && apt-get install -y make wget cmake libqt4-dev
-RUN wget https://xpdfreader-dl.s3.amazonaws.com/xpdf-4.02.tar.gz
+RUN wget --no-check-certificate https://dl.xpdfreader.com/xpdf-latest.tar.gz
 
 WORKDIR $SRC
 COPY fuzz_*.cc $SRC/
diff --git a/projects/xpdf/build.sh b/projects/xpdf/build.sh
index 4dfc18979..05a904154 100755
--- a/projects/xpdf/build.sh
+++ b/projects/xpdf/build.sh
@@ -15,11 +15,10 @@
 #
 ################################################################################
 
-# Unpack the file
-tar -zxvf xpdf-4.02.tar.gz   
-
-# Now make the build directory
-cd xpdf-4.02
+# Unpack the file and cd into it
+tar -zxvf xpdf-latest.tar.gz
+dir_name=`tar -tzf xpdf-latest.tar.gz | head -1 | cut -f1 -d"/"`
+cd $dir_name
 
 # Make minor change in the CMakeFiles file.
 sed -i 's/#--- object files needed by XpdfWidget/add_library(testXpdfStatic STATIC $<TARGET_OBJECTS:xpdf_objs>)\n#--- object files needed by XpdfWidget/' ./xpdf/CMakeLists.txt