diff --git a/.gitignore b/.gitignore
index bc97331..a1580aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,5 @@ gdalautotest-1.7.0.tar.gz
 /gdal-2.2.3-fedora.tar.xz
 /gdalautotest-2.2.4.tar.gz
 /gdal-2.2.4-fedora.tar.xz
+/gdalautotest-2.3.1.tar.gz
+/gdal-2.3.1-fedora.tar.xz
diff --git a/gdal-2.2.2-zlib.patch b/gdal-2.2.2-zlib.patch
deleted file mode 100644
index 235768f..0000000
--- a/gdal-2.2.2-zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gdal-2.2.3-fedora/frmts/mrf/mrf_band.cpp
-===================================================================
---- gdal-2.2.3-fedora.orig/frmts/mrf/mrf_band.cpp
-+++ gdal-2.2.3-fedora/frmts/mrf/mrf_band.cpp
-@@ -49,7 +49,7 @@
- 
- #include <vector>
- #include <assert.h>
--#include "../zlib/zlib.h"
-+#include <zlib.h>
- 
- CPL_CVSID("$Id: mrf_band.cpp 37663 2017-03-09 20:42:19Z lplesea $");
- 
diff --git a/gdal-2.2.4-poppler-0.64.0.patch b/gdal-2.2.4-poppler-0.64.0.patch
deleted file mode 100644
index 1b0f71a..0000000
--- a/gdal-2.2.4-poppler-0.64.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 124f0343436d1267319ac627fc220530091b41ea Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Sat, 5 May 2018 22:18:37 +0200
-Subject: Fix build with recent Poppler (0.64) (fix #573)
-
-
-diff --git a/gdal/frmts/pdf/pdfobject.cpp b/gdal/frmts/pdf/pdfobject.cpp
-index ae734a74e4..5eab5dd154 100644
---- a/frmts/pdf/pdfobject.cpp
-+++ b/frmts/pdf/pdfobject.cpp
-@@ -1055,7 +1055,12 @@ const CPLString& GDALPDFObjectPoppler::GetString()
- {
-     if (GetType() == PDFObjectType_String)
-     {
-+#ifdef POPPLER_0_58_OR_LATER
-+        // At least available since poppler 0.41
-+        const GooString* gooString = m_po->getString();
-+#else
-         GooString* gooString = m_po->getString();
-+#endif
-         return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
-                                                       static_cast<int>(gooString->getLength())));
-     }
diff --git a/gdal-2.3.0-zlib.patch b/gdal-2.3.0-zlib.patch
new file mode 100644
index 0000000..a830193
--- /dev/null
+++ b/gdal-2.3.0-zlib.patch
@@ -0,0 +1,13 @@
+diff --git a/frmts/mrf/mrf_band.cpp b/frmts/mrf/mrf_band.cpp
+index d5b3403..0772ec8 100644
+--- a/frmts/mrf/mrf_band.cpp
++++ b/frmts/mrf/mrf_band.cpp
+@@ -49,7 +49,7 @@
+ 
+ #include <vector>
+ #include <assert.h>
+-#include "../zlib/zlib.h"
++#include <zlib.h>
+ 
+ CPL_CVSID("$Id: mrf_band.cpp 7e07230bbff24eb333608de4dbd460b7312839d0 2017-12-11 19:08:47Z Even Rouault $")
+ 
diff --git a/gdal-cleaner.sh b/gdal-cleaner.sh
index 926b940..f14e0e3 100755
--- a/gdal-cleaner.sh
+++ b/gdal-cleaner.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-# Volker Fröhlich
-VERSION="2.2.4"
+VERSION="2.3.1"
 
 tar xvf gdal-"${VERSION}".tar.xz
 
diff --git a/gdal.spec b/gdal.spec
index 1eab553..031a473 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -24,7 +24,7 @@
 %global proj_somaj 12
 
 # Tests can be of a different version
-%global testversion 2.2.4
+%global testversion 2.3.1
 %global run_tests 0
 
 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion)
@@ -61,8 +61,8 @@
 %endif
 
 Name:		gdal
-Version:	2.2.4
-Release:	10%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
+Version:	2.3.1
+Release:	1%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap}
 Summary:	GIS file format library
 Group:		System Environment/Libraries
 License:	MIT
@@ -89,9 +89,7 @@ Patch3:		%{name}-completion.patch
 # Fedora uses Alternatives for Java
 Patch8:		%{name}-1.9.0-java.patch
 
-Patch9:		%{name}-2.2.2-zlib.patch
-
-Patch10:	%{name}-2.2.4-poppler-0.64.0.patch
+Patch9:		%{name}-2.3.0-zlib.patch
 
 BuildRequires:	gcc gcc-c++
 BuildRequires:	ant
@@ -322,14 +320,13 @@ rm -rf frmts/jpeg/libjpeg \
     frmts/jpeg/libjpeg12
 rm -rf frmts/gtiff/libgeotiff \
     frmts/gtiff/libtiff
-rm -r frmts/grib/degrib18/g2clib-1.0.4
+#rm -r frmts/grib/degrib/g2clib
 
-%patch1 -p1 -b .g2clib~
-%patch2 -p1 -b .jni~
+#%patch1 -p1 -b .g2clib~
+#%patch2 -p1 -b .jni~
 %patch3 -p1 -b .completion~
 %patch8 -p1 -b .java~
 %patch9 -p1 -b .zlib~
-%patch10 -p1 -b .poppler~
 
 # Copy in PROVENANCE.TXT-fedora
 cp -p %SOURCE4 .
@@ -354,10 +351,9 @@ for f in `find . -type f` ; do
 done
 set -x
 
-# Solved for 2.0
-for f in ogr/ogrsf_frmts/gpsbabel ogr/ogrsf_frmts/pgdump port apps; do
+for f in apps; do
 pushd $f
-  chmod 644 *.cpp *.h
+  chmod 644 *.cpp
 popd
 done
 
@@ -877,6 +873,9 @@ popd
 #Or as before, using ldconfig
 
 %changelog
+* Tue Aug 14 2018 Volker Fröhlich <volker27@gmx.at> - 2.3.1-1
+- New upstream release
+
 * Tue Aug 14 2018 Marek Kasik <mkasik@redhat.com> - 2.2.4-10
 - Rebuild for poppler-0.67.0
 
diff --git a/sources b/sources
index eb3999a..f070bdb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gdalautotest-2.2.4.tar.gz) = c7dd8e007c84b112f7d6384d5e28981a929b81409b41bd02495c4d7b99a72aa4ee92884a90e0246c3b1c8c723b9272979a89f15b00794abebde97a36d6344ee9
-SHA512 (gdal-2.2.4-fedora.tar.xz) = a8c878c0b9ea56575eaa72434990a1473a9dfc40dc7794d0a752846b0f945e8f38da02b7a264f7450b44ba3d021ee7af6e1ec6be57e955594f4b33caa4d1ddd0
+SHA512 (gdalautotest-2.3.1.tar.gz) = acd3bf4fb719b9aa44b41eb14ae1676cde6a3213e14defa91220680ab1411ae9fbcb5227fb64d5c3c12b89b721986e7f93184eb7c5702cbe81a57a57dac1b403
+SHA512 (gdal-2.3.1-fedora.tar.xz) = da128e67d505d9e988b6af1255206ed84b491a1ec9fb8ecd13980259b0405d3eb7f9352ae80bd714b5398ec2092206429a3f25ed0211b461d20888bd2e854ef1