diff --git a/GDALmake.opt.in.patch b/GDALmake.opt.in.patch
index 93af299..b8c81c2 100644
--- a/GDALmake.opt.in.patch
+++ b/GDALmake.opt.in.patch
@@ -1,12 +1,12 @@
 diff -rup a/GDALmake.opt.in b/GDALmake.opt.in
---- a/GDALmake.opt.in	2017-04-28 18:07:38.000000000 +0200
-+++ b/GDALmake.opt.in	2017-05-19 21:11:58.318459759 +0200
+--- a/GDALmake.opt.in	2018-05-04 18:05:45.000000000 +0200
++++ b/GDALmake.opt.in	2018-05-14 09:47:11.178524546 +0200
 @@ -67,7 +67,7 @@ INST_DOCS	=	@exec_prefix@/doc
  INST_MAN	=	@mandir@
  INST_HTML	=	$(HOME)/www/gdal
  
--CPPFLAGS	= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
-+CPPFLAGS	= @CPPFLAGS@ -I$(GDAL_ROOT)/port -I$(GDAL_ROOT)/gcore @EXTRA_INCLUDES@ -DGDAL_COMPILATION
+-CPPFLAGS	:= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
++CPPFLAGS	:= @CPPFLAGS@ -I$(GDAL_ROOT)/gcore -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
  CFLAGS		= @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
  CXXFLAGS	= @CXXFLAGS@ @CXX_WFLAGS@ $(USER_DEFS)
  CFLAGS_NOFTRAPV          = @CFLAGS_NOFTRAPV@ @C_WFLAGS@ $(USER_DEFS)
diff --git a/gdal-2.2.4.tar.xz b/gdal-2.2.4.tar.xz
deleted file mode 100644
index e839792..0000000
--- a/gdal-2.2.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:441eb1d1acb35238ca43a1a0a649493fc91fdcbab231d0747e9d462eea192278
-size 8255840
diff --git a/gdal-2.3.0.tar.xz b/gdal-2.3.0.tar.xz
new file mode 100644
index 0000000..92d6cba
--- /dev/null
+++ b/gdal-2.3.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f75e49aa30de140525ccb58688667efe3a2d770576feb7fbc91023b7f552aa2
+size 8760248
diff --git a/gdal-libproj.patch b/gdal-libproj.patch
index e60269d..cab8d6a 100644
--- a/gdal-libproj.patch
+++ b/gdal-libproj.patch
@@ -1,12 +1,11 @@
 diff -rup a/ogr/ogrct.cpp b/ogr/ogrct.cpp
---- a/ogr/ogrct.cpp	2017-04-28 18:07:33.000000000 +0200
-+++ b/ogr/ogrct.cpp	2017-05-19 21:06:54.145528449 +0200
-@@ -102,7 +102,7 @@ static bool      bProjLocaleSafe = false
- #elif defined(__APPLE__)
+--- a/ogr/ogrct.cpp	2018-05-04 18:08:49.000000000 +0200
++++ b/ogr/ogrct.cpp	2018-05-14 09:49:42.824062814 +0200
+@@ -125,6 +125,7 @@ static bool      bProjLocaleSafe = false
  #  define LIBNAME "libproj.dylib"
  #else
--#  define LIBNAME "libproj.so"
+ #  define LIBNAME "libproj.so"
 +#  define LIBNAME "libproj.so.12"
  #endif
  
- /************************************************************************/
+ #endif // PROJ_VERSION == 4
diff --git a/gdal.changes b/gdal.changes
index b536a88..5acb3b5 100644
--- a/gdal.changes
+++ b/gdal.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Mon May 14 14:03:36 UTC 2018 - bruno@ioda-net.ch
+
+- Upgrade to new 2.3.0 version
+  See details https://trac.osgeo.org/gdal/wiki/Release/2.3.0-News   
+  + Source code is now hosted on github
+  + RFC 70: Guessing output format from output file name extension
+    for utilities
+    https://trac.osgeo.org/gdal/wiki/rfc70_output_format_guess
+  + RFC 68: C++11 Compilation requirement
+    https://trac.osgeo.org/gdal/wiki/rfc68_cplusplus11
+    GDAL now requires a C++11 compatible compiler. External code 
+    using GDAL C++ API will also need to enable at least C++11 
+    compilation mode, if the compiler defaults to C++98/C++03.
+  + Stricter const-ness in OGRGeomFieldDefn, OGRFeatureDefn and 
+    OGRFeature classes, impacting out-of-tree drivers that subclass
+    them.
+- Packaging : redone patches against new version
+  + GDALmake.opt.in.patch
+  + gdal-libproj.patch
+
+-------------------------------------------------------------------
+Mon May  7 12:40:25 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Add optional support to ECW5 JPEG lib support disabled by default
+
 -------------------------------------------------------------------
 Thu Apr  5 14:51:21 UTC 2018 - bruno@ioda-net.ch
 
diff --git a/gdal.spec b/gdal.spec
index 6cc3e29..e6d3d2c 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -21,8 +21,9 @@
 %define soversion 20
 %define sourcename gdal
 %bcond_with ecw_support
+%bcond_with ecw5_support
 Name:           gdal
-Version:        2.2.4
+Version:        2.3.0
 Release:        0
 Summary:        GDAL/OGR - a translator library for raster and vector geospatial data formats
 License:        MIT AND BSD-3-Clause AND SUSE-Public-Domain
@@ -75,9 +76,13 @@ BuildRequires:  pkgconfig(spatialite)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(xerces-c)
 BuildRequires:  pkgconfig(zlib) >= 1.1.4
+%if %{with ecw5_support}
+BuildRequires:  ERDAS-ECW_JPEG_2000_SDK-devel
+%else
 %if %{with ecw_support}
 BuildRequires:  libecwj2-devel
 %endif
+%endif
 %if 0%{?suse_version} >= 1310
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -173,6 +178,18 @@ done
 #Fix wrong /usr/bin/env phyton
 #Create the move to python3
 find . -iname "*.py" -exec sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,' {} \;
+%if %{with ecw5_support}
+# gdal configure script looks for a given layout, so reproduce what is expected.
+%if 0%{suse_version} >= 1500
+%define ecw_abi_conf newabi
+%else
+%define ecw_abi_conf ""
+%endif
+mkdir -p ../ECW/Desktop_Read-Only/lib/%{ecw_abi_conf}/x64/release/
+mkdir -p ../ECW/Desktop_Read-Only/include
+cp %{_libdir}/libNCSEcw* ../ECW/Desktop_Read-Only/lib/%{ecw_abi_conf}/x64/release/
+cp -r %{_includedir}/{ECW*,NCS*} ../ECW/Desktop_Read-Only/include/
+%endif
 
 %build
 # need to regenerate (old one does not accept CFLAGS)
@@ -216,10 +233,14 @@ autoreconf -fi
         --with-xerces=yes       \
         --with-xerces-lib="-lxerces-c" \
         --with-xerces-inc=%{_includedir}/xercesc \
+%if %{with ecw5_support}
+        --with-ecw=../ECW/     \
+%else
 %if %{with ecw_support}
         --with-ecw              \
         CFLAGS="$CFLAGS -pthread" \
 %endif
+%endif
 %if 0%{?suse_version} > 1320
         --with-opencl           \
 %endif