diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index 512a723..30c2229 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -14,10 +14,15 @@ Patch1:         %{name}-cmake.patch
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-BuildRequires:  community-mysql-devel
-BuildRequires:  gtk3-devel
+BuildRequires:  community-mysql-devel >= 8
 BuildRequires:  unixODBC-devel
 
+# Required for GUI
+#   GUI currently off. To switch it ON, uncomment gtk buildrequires and change CMake argument DISABLE_GUI
+#   GUI does not make any sense on headless servers for example, which is a valid use case. I don't want
+#   this tiny package to have dependency on X and GTK.
+# BuildRequires:  gtk3-devel
+
 %description
 An ODBC (rev 3) driver for MySQL, for use with unixODBC.
 
@@ -30,35 +35,38 @@ An ODBC (rev 3) driver for MySQL, for use with unixODBC.
 mkdir build && pushd build
 export LDFLAGS="%__global_ldflags"
 cmake .. \
+        -DCMAKE_BUILD_TYPE=RelWithDebinfo \
         -DWITH_UNIXODBC=1 \
         -DRPM_BUILD=1 \
         -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
         -DMYSQLCLIENT_STATIC_LINKING=OFF \
         -DCMAKE_C_FLAGS="%{optflags}" \
-        -DCMAKE_CXX_FLAGS="%{optflags}"
+        -DCMAKE_CXX_FLAGS="%{optflags}" \
+        -DDISABLE_GUI=1
+
+cmake .. -LH
+
 make %{?_smp_mflags} VERBOSE=1
 
 %install
 pushd build
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# Remove stuff not to be packaged (possibly reconsider later)
+# Remove stuff not to be packaged, this tool is for archive distribution
+# https://dev.mysql.com/doc/connector-odbc/en/connector-odbc-installation-binary-unix-tarball.html
 rm -f $RPM_BUILD_ROOT%{_bindir}/myodbc-installer
 
 # Remove any file in /usr
 find $RPM_BUILD_ROOT/usr/ -maxdepth 1 -type f -delete
 
 # Create a symlink for library to offer name that users are used to
-ln -sf libmyodbc5w.so $RPM_BUILD_ROOT%{_libdir}/libmyodbc5.so
+ln -sf libmyodbc8w.so $RPM_BUILD_ROOT%{_libdir}/libmyodbc8.so
 
 # Upstream provides a test suite with functional and regression tests.
 # However, some tests fail, so it would deserve some more investigation.
 # We don't include the test suite until it works fine.
 rm -rf $RPM_BUILD_ROOT/usr/test
 
-# Can be dropped on F27 EOL
-%ldconfig_scriptlets
-
 %files
 %license LICENSE.txt
 %doc ChangeLog README.txt
@@ -66,10 +74,13 @@ rm -rf $RPM_BUILD_ROOT/usr/test
 
 %changelog
 * Fri Nov 30 2018 Lars Tangvald <lars.tangvald@oracle.com> - 8.0.13-1
-- 8.0.13
+- Rebase to 8.0.13
+  Resolves: #1569767
+  Resolves: #1604908
 - Rediff 64bit patch
 - Remove obsolete patches
 - Add cmake patch
+- Disable building with GUI
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.10-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/sources b/sources
index 0cc35cb..1f09974 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-connector-odbc-5.3.10-src.tar.gz) = ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
+SHA512 (mysql-connector-odbc-8.0.13-src.tar.gz) = 0f6899efb5ac3912e07fb0267da60a220d4fd4bb9af28a9184fc83145c9ef8de3310922677b2aead93238580c4539aa38b568b577a868004be066e6e69183b6b