diff --git a/.gitignore b/.gitignore
index 810258a..fef57c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /mariadb-connector-c-2.3.3-src.tar.gz
 /mariadb-connector-c-3.0.2-src.tar.gz
 /mariadb-connector-c-3.0.3-src.tar.gz
+/mariadb-connector-c-3.0.4-src.tar.gz
diff --git a/cmake.patch b/cmake.patch
index f439c2c..27ead07 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,20 +1,23 @@
---- mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in	2017-07-19 11:31:02.000000000 +0200
-+++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in_patched	2017-10-25 12:32:42.075324299 +0200
-@@ -5,8 +5,8 @@
+The binary 'mariadb_config' produces its output as some concatenation on a prefix, path and suffix.
+The upstream tries to use one binary for all distros, but that does not work as it should for Fedora.
+
+Often producing double prefixes and suffixes to some options.
+For example:
+#  --cflags        [-I/usr//usr/include/mysql -I/usr//usr/include/mysql/mysql]
+  
+
+--- mariadb-connector-c-3.0.4-src/mariadb_config/mariadb_config.c.in	2018-04-24 12:22:12.000000000 +0200
++++ mariadb-connector-c-3.0.4-src/mariadb_config/mariadb_config.c.in_patched	2018-04-26 13:05:49.737644735 +0200
+@@ -5,13 +5,13 @@
  
  static char *mariadb_progname;
  
 -#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
--#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\
+-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
 +#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@"
-+#define LIBS    "-L@INSTALL_LIBDIR@/ -lmariadb "\
-                 "@extra_dynamic_LDFLAGS@"
++#define LIBS    "-L@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
  #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
  #define CFLAGS  INCLUDE
---- mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in	2018-04-23 14:05:44.061943591 +0200
-+++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in_patched	2018-04-23 14:12:11.645251018 +0200
-@@ -12,7 +12,7 @@ static char *mariadb_progname;
- #define CFLAGS  INCLUDE
  #define VERSION "@MARIADB_CLIENT_VERSION@"
  #define CC_VERSION "@CPACK_PACKAGE_VERSION@"
 -#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index 131fc82..e385aff 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -1,6 +1,6 @@
 Name:           mariadb-connector-c
-Version:        3.0.3
-Release:        4%{?dist}
+Version:        3.0.4
+Release:        1%{?dist}
 Summary:        The MariaDB Native Client library (C driver)
 License:        LGPLv2+
 Source:         https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
@@ -64,10 +64,12 @@ rm -r win zlib win-iconv examples
        -DINSTALL_LAYOUT=RPM \
        -DINSTALL_BINDIR="%{_bindir}" \
        -DINSTALL_LIBDIR="%{_libdir}" \
-       -DINSTALL_INCLUDEDIR=%{_includedir}/mysql \
+       -DINSTALL_INCLUDEDIR="%{_includedir}/mysql" \
        -DINSTALL_PLUGINDIR="%{_libdir}/mariadb/plugin"
 
 
+#cmake -LAH
+
 # Causes build errors:
 #   -DAUTH_NATIVE=DYNAMIC
 #   -DCMAKE_INSTALL_PREFIX="/usr"
@@ -149,6 +151,9 @@ end
 #   https://jira.mariadb.org/browse/CONC-291
 
 %changelog
+* Thu Apr 26 2018 Michal Schorm <mschorm@redhat.com> - 3.0.4-1
+- Rebase to 3.0.4
+
 * Mon Apr 23 2018 Michal Schorm <mschorm@redhat.com> - 3.0.3-4
 - Further fix of the '--plugindir' output from the config binary
   Realted: #1569159
diff --git a/sources b/sources
index ef7f6eb..22ac10d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-connector-c-3.0.3-src.tar.gz) = 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04
+SHA512 (mariadb-connector-c-3.0.4-src.tar.gz) = 6edc7b70380aade1c88a3d9dac70d6da846e6e2e7d7b0dc2eddaba148dc3889f2baa3e757a8b91e479b1ae14051d9f948fbfdc516219e21d4a3117f6700cb020