diff --git a/pkg.info b/pkg.info
index 0289d86..3ed6a9a 100644
--- a/pkg.info
+++ b/pkg.info
@@ -1,10 +1,39 @@
 name: ghostscript
 description: Interpreter for the PostScript language and PDF files
 version: 10.06.0
+revision: 2
 url: https://www.ghostscript.com/
 license: AGPL3-or-later
 architecture: any
-depends: ["cairo","fontconfig","gdk-pixbuf","glib","glibc","lcms2","libcups","libidn2","libjpeg-turbo","libpaper","libpng","libtiff","libx11","libxt","openjpeg","zlib"]
-optional_depends: ["gtk3"]
-make_depends: ["freeglut","glu","gnutls","gtk3"]
 type: source
+depends:
+  - cairo
+  - fontconfig
+  - gdk-pixbuf
+  - glib
+  - glibc
+  - lcms2
+  - libcups
+  - libidn2
+  - libjpeg-turbo
+  - libpaper
+  - libpng
+  - libtiff
+  - libx11
+  - libxt
+  - openjpeg
+  - poppler-data
+  - sh
+  - zlib
+optional_depends:
+  - gtk3
+make_depends:
+  - freeglut
+  - glu
+  - gnutls
+  - gtk3
+downloads:
+  - url: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${BPM_PKG_VERSION//./}/ghostscript-${BPM_PKG_VERSION}.tar.xz
+    extract_to: ${BPM_SOURCE}
+    extract_strip_components: 1
+    checksum: 64352648c2c081c8a9fb1a12dc1965e01ead7c57f58b72d1b54f6ef1cef3c561
diff --git a/source.sh b/source.sh
index a5d27cf..2470810 100644
--- a/source.sh
+++ b/source.sh
@@ -2,21 +2,14 @@
 # BPM Expects the source code to be extracted into the automatically created 'source' directory which can be accessed using $BPM_SOURCE
 # BPM Expects the output files to be present in the automatically created 'output' directory which can be accessed using $BPM_OUTPUT
 
-DOWNLOAD="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${BPM_PKG_VERSION//./}/ghostscript-${BPM_PKG_VERSION}.tar.xz"
-FILENAME="${DOWNLOAD##*/}"
-
-# The prepare function is executed in the root of the temp directory
-# This function is used for downloading files and putting them into the correct location
-prepare() {
-  wget "$DOWNLOAD"
-  tar -xvf "$FILENAME" --strip-components=1 -C "$BPM_SOURCE"
-}
-
 # The build function is executed in the source directory
 # This function is used to compile the source code
 build() {
   # Prevent linking to bundled libraries
-  rm -rf cups/libs jpeg lcms2mt libpng openjpeg tiff zlib gdpl
+  rm -rf cups/libs jpeg lcms2mt leptonica libpng openjpeg tesseract tiff zlib gdpl
+
+  # Remove internal cmaps
+  rm -rf Resource/CMap
 
   export CFLAGS="${CFLAGS:--g -O3} -fPIC"
   ./configure --prefix=/usr            \