diff --git a/ghostscript-9.20-system-zlib.patch b/ghostscript-9.20-system-zlib.patch
new file mode 100644
index 0000000..d632fcb
--- /dev/null
+++ b/ghostscript-9.20-system-zlib.patch
@@ -0,0 +1,25 @@
+diff -up ghostscript-9.12/configure.ac.sys-zlib ghostscript-9.12/configure.ac
+--- ghostscript-9.12/configure.ac.sys-zlib	2014-03-26 11:48:54.983972222 +0000
++++ ghostscript-9.12/configure.ac	2014-03-26 11:49:36.807230531 +0000
+@@ -854,7 +854,7 @@ AC_MSG_CHECKING([for local zlib source])
+ dnl zlib is needed for language level 3, and libpng
+ # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
+ # this seems a harmless default
+-ZLIBDIR=src
++ZLIBDIR=$includedir
+ AUX_SHARED_ZLIB=
+ 
+ if test -d $srcdir/zlib; then
+diff -up ghostscript-9.12/configure.sys-zlib ghostscript-9.12/configure
+--- ghostscript-9.12/configure.sys-zlib	2014-03-26 11:49:45.547284521 +0000
++++ ghostscript-9.12/configure	2014-03-26 11:49:56.171350127 +0000
+@@ -6254,7 +6254,7 @@ fi
+ $as_echo_n "checking for local zlib source... " >&6; }
+ # we must define ZLIBDIR regardless because png.mak does a -I$(ZLIBDIR)
+ # this seems a harmless default
+-ZLIBDIR=src
++ZLIBDIR=$includedir
+ AUX_SHARED_ZLIB=
+ 
+ if test -d $srcdir/zlib; then
+
diff --git a/ghostscript.spec b/ghostscript.spec
index 78403f6..26c5a7e 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -3,7 +3,7 @@
 
 Name:          ghostscript
 Version:       9.20
-Release:       1mamba
+Release:       3mamba
 Summary:       The GPL release of the Ghostscript interpreter
 Group:         Applications/Publishing
 Vendor:        openmamba
@@ -14,32 +14,38 @@ Source:        https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/do
 #Source:        http://downloads.ghostscript.com/public/ghostscript-%{version}.tar.gz
 #Source:        http://downloads.sourceforge.net/sourceforge/ghostscript/ghostscript-%{version}.tar.bz2
 Patch0:        ghostscript-9.07-european-locales-comma-separator.patch
+Patch1:        ghostscript-9.20-system-zlib.patch
 License:       GPL
-Requires:      %{name}-fonts
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: ghostscript-fonts
 BuildRequires: glibc-devel
-BuildRequires: libatk-devel
-%if "%{stage1}" != "1"
-BuildRequires: libcairo-devel
-BuildRequires: libpango-devel
-BuildRequires: libcups-devel
-BuildRequires: libgtk-devel
-%endif
-BuildRequires: libfontconfig-devel
-BuildRequires: libgcrypt-devel
-BuildRequires: libglib-devel
-BuildRequires: libgnutls-devel
-BuildRequires: libgpg-error-devel
 BuildRequires: libICE-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
 BuildRequires: libSM-devel
-BuildRequires: libstdc++6-devel
-BuildRequires: libtiff-devel
 BuildRequires: libX11-devel
 BuildRequires: libXext-devel
 BuildRequires: libXt-devel
+BuildRequires: libatk-devel
+%if "%{stage1}" != "1"
+BuildRequires: libcairo-devel
+BuildRequires: libcups-devel
+%endif
+BuildRequires: libe2fs-devel
+BuildRequires: libfontconfig-devel
+BuildRequires: libfreetype-devel
+BuildRequires: libgdk-pixbuf-devel
+BuildRequires: libglib-devel
+BuildRequires: libgnutls-devel
+%if "%{stage1}" != "1"
+BuildRequires: libgtk-devel
+%endif
+BuildRequires: libidn-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libkrb5-devel
+%if "%{stage1}" != "1"
+BuildRequires: libpango-devel
+%endif
+BuildRequires: libpaper-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
 BuildRequires: libkrb5-devel
@@ -49,6 +55,8 @@ BuildRequires: libtool >= 1.5.22
 BuildRequires: libGLUT-devel
 BuildRequires: libSDL-devel
 %endif
+Requires:      %{name}-fonts
+Requires:      libgs = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      ghostscript-cups
 Obsoletes:     ghostscript-cups
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
@@ -60,12 +68,27 @@ Ghostscript is a package of software that provides:
 - The ability to convert PostScript language files to PDF (with some limitations) and vice versa; and
 - A set of C procedures (the Ghostscript library) that implement the graphics and filtering (data compression / decompression / conversion) capabilities that appear as primitive operations in the PostScript language and in PDF.
 
-%package devel
+%package -n libgs
+Summary:        Ghostscript shared libraries
+Group:          System/Libraries
+
+%description -n libgs
+- An interpreter for the PostScript (TM) language, with the ability to convert PostScript language files to many raster formats, view them on displays, and print them on printers that don't have PostScript language capability built in;
+- An interpreter for Portable Document Format (PDF) files, with the same abilities;
+- The ability to convert PostScript language files to PDF (with some limitations) and vice versa; and
+- A set of C procedures (the Ghostscript library) that implement the graphics and filtering (data compression / decompression / conversion) capabilities that appear as primitive operations in the PostScript language and in PDF.
+
+This package provides shared libraries provided by Ghostscript.
+
+%package -n libgs-devel
 Summary:        Headers and static libraries for development with Ghostscript
 Group:          Development/Libraries
+Provides:       ghostscript-devel
+Obsoletes:      ghostscript-devel
+Requires:       libgs = %{?epoch:%epoch:}%{version}-%{release}
 Requires:       %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
-%description devel
+%description -n libgs-devel
 - An interpreter for the PostScript (TM) language, with the ability to convert PostScript language files to many raster formats, view them on displays, and print them on printers that don't have PostScript language capability built in;
 - An interpreter for Portable Document Format (PDF) files, with the same abilities;
 - The ability to convert PostScript language files to PDF (with some limitations) and vice versa; and
@@ -104,10 +127,16 @@ X11 support library for Ghostscript.
 %prep
 %setup -q
 #-D -T
+#:<< _EOF
 #%patch0 -p1
+%patch1 -p1
+
+# To force using system libs
+rm -rfv cups/libs freetype jbig2dec jpeg lcms2 libpng tiff zlib
 
 %build
 #:<< _EOF
+./autogen.sh
 FONTPATH=
 for path in \
    %{_datadir}/cups/fonts \
@@ -120,22 +149,31 @@ done
 
 %configure \
    --enable-dynamic \
-   --enable-gtk \
    --disable-compile-inits \
    --with-drivers=ALL \
    --with-fontpath="$FONTPATH" \
    --with-system-libtiff \
-   --with-ijs
+   --with-ijs \
+   --with-jbig2dec \
+   --without-omni \
+   --enable-gtk \
+   --with-x \
+   --enable-fontconfig \
+   --enable-freetype \
+   --enable-openjpeg \
+   --without-luratech \
+   --with-libpaper
 
-FT_CFLAGS=$(pkg-config --cflags freetype2)
-%make -j1 prefix=%{_prefix}
-# \
 #   FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
-%make -j1 so prefix=%{_prefix}
+
+# If using macros that add CFLAGS be sure it works
+make so PNGSRCDIR=%{_includedir}
+make PNGSRCDIR=%{_includedir}
+
 # \
 #   FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
 
-# build ijs
+## build ijs
 cd ijs
 sed -i "s|AM_PROG_CC_STDC|AC_PROG_CC|" configure.ac
 aclocal
@@ -146,24 +184,28 @@ cd ..
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall soinstall
+%makeinstall soinstall \
+    PNGSRCDIR=%{_includedir} \
+	cups_serverroot=%{buildroot}%{_sysconfdir}/cups \
+	cups_serverbin=%{buildroot}%{_prefix}/lib/cups
+
 # FT_BRIDGE=1
 #   CUPSSERVER=%{buildroot}`cups-config --serverbin` \
 #   CUPSCONFIG=%{buildroot}`cups-config --serverroot` \
 #   CUPSDATA=%{buildroot}`cups-config --datadir`
 
-# install ijs
+## install ijs
 cd ijs
 %makeinstall
 cd ..
 
-install -m0644 base/gserrors.h %{buildroot}%{_includedir}/ghostscript/
+install -m0644 base/*.h %{buildroot}%{_includedir}/ghostscript/
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n libgs -p /sbin/ldconfig
+%postun -n libgs -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -204,13 +246,16 @@ install -m0644 base/gserrors.h %{buildroot}%{_includedir}/ghostscript/
 %{_bindir}/unix-lpr.sh
 %{_bindir}/wftopfa
 %{_datadir}/ghostscript
-%{_libdir}/libgs.so.*
-%{_libdir}/libijs-*.so*
 %{_mandir}/man1/*
 %{_mandir}/de/*
 #%doc LICENSE
 
-%files devel
+%files -n libgs
+%defattr(-,root,root)
+%{_libdir}/libgs.so.*
+%{_libdir}/libijs-*.so*
+
+%files -n libgs-devel
 %defattr(-,root,root)
 #%{_bindir}/ijs-config
 %{_bindir}/ijs_client_example
@@ -245,6 +290,12 @@ install -m0644 base/gserrors.h %{buildroot}%{_includedir}/ghostscript/
 %{_libdir}/ghostscript/*/X11.so
 
 %changelog
+* Thu Nov 03 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 9.20-3mamba
+- rebuilt ensuring more system libraries are used
+
+* Thu Nov 03 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 9.20-2mamba
+- rebuilt with mode configure options
+
 * Sun Oct 02 2016 Automatic Build System <autodist@mambasoft.it> 9.20-1mamba
 - automatic version update by autodist