diff --git a/.gitignore b/.gitignore
index 5d5c3b8..71ea958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /mariadb-connector-odbc-3.0.7-ga-src.tar.gz
 /mariadb-connector-odbc-3.0.8-ga-src.tar.gz
 /mariadb-connector-odbc-3.0.9-ga-src.tar.gz
+/mariadb-connector-odbc-3.1.1-ga-src.tar.gz
diff --git a/libdir.patch b/libdir.patch
new file mode 100644
index 0000000..9d7a3d4
--- /dev/null
+++ b/libdir.patch
@@ -0,0 +1,13 @@
+Reported upstream as: https://jira.mariadb.org/browse/ODBC-254
+
+--- mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt	2019-05-02 14:41:44.000000000 +0200
++++ mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt_patched	2019-06-04 13:45:49.603601852 +0200
+@@ -324,7 +324,7 @@ ELSE()
+   IF(NOT DEFINED INSTALL_LIB_SUFFIX)
+     SET(INSTALL_LIB_SUFFIX "lib")
+     IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND EXISTS "/usr/lib64/")
+-      SET(INSTALL_LIB_SUFFIX "lib")
++      SET(INSTALL_LIB_SUFFIX "lib64")
+     ENDIF()
+   ENDIF()
+ 
diff --git a/mariadb-connector-odbc.spec b/mariadb-connector-odbc.spec
index b0ffa6f..08c2df7 100644
--- a/mariadb-connector-odbc.spec
+++ b/mariadb-connector-odbc.spec
@@ -1,5 +1,5 @@
 Name:           mariadb-connector-odbc
-Version:        3.0.9
+Version:        3.1.1
 Release:        1%{?dist}
 Summary:        The MariaDB Native Client library (ODBC driver)
 License:        LGPLv2+
@@ -10,6 +10,7 @@ BuildRequires:  cmake unixODBC-devel gcc-c++
 BuildRequires:  mariadb-connector-c-devel >= 3.0.6
 
 Patch1:         libraries_include_path.patch
+Patch2:         libdir.patch
 
 %description
 MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using
@@ -20,6 +21,7 @@ and it supports both Unicode and ANSI modes.
 %prep
 %setup -q -n %{name}-%{version}-ga-src
 %patch1 -p1
+%patch2 -p1
 
 %build
 %cmake -DMARIADB_LINK_DYNAMIC="%{_libdir}/libmariadb.so" \
@@ -54,6 +56,9 @@ rm %{buildroot}%{_datadir}/doc/mariadb_connector_odbc/README
 
 
 %changelog
+* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-1
+- Rebase to 3.1.1
+
 * Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3.0.9-1
 - Rebase to 3.0.9
 
diff --git a/sources b/sources
index 83e8027..a4522c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-connector-odbc-3.0.9-ga-src.tar.gz) = 6877ae7fc8e8ccfda332d70b38d782d2ba4d16ff70c325b993a0edd30b4aa9b76cb6db2642311808d0c94c0636bb2818d1d1ccd6051dc45ca91ad7220a295412
+SHA512 (mariadb-connector-odbc-3.1.1-ga-src.tar.gz) = 4532dbbaf8d46c17fa85399fc5003fe6cbb8b5695d73ca9c87cdc3b74ab3250f9af21a1337f1d1e51fbe75b0cffcf4ba3fabd1a43ad3313854f58adeebceaaa3