diff --git a/.gitignore b/.gitignore
index 71ea958..8efd36f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /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
+/mariadb-connector-odbc-3.1.2-ga-src.tar.gz
diff --git a/cmake_docdir_licensedir_configurable.patch b/cmake_docdir_licensedir_configurable.patch
deleted file mode 100644
index 6303fbb..0000000
--- a/cmake_docdir_licensedir_configurable.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Reported upstream as a RFE:
-https://jira.mariadb.org/browse/ODBC-258
-
---- 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-25 14:31:46.211295272 +0200
-@@ -333,12 +333,24 @@ ELSE()
-           LIBRARY DESTINATION ./${INSTALL_LIB_SUFFIX}
-           COMPONENT ODBCLibs)
- 
-+  IF(NOT DEFINED INSTALL_DOC_DIR)
-+    SET(INSTALL_DOC_DIR "./share/doc/${CPACK_PACKAGE_NAME}/")
-+  ENDIF()
-+  IF(NOT DEFINED INSTALL_LICENSE_DIR)
-+    SET(INSTALL_LICENSE_DIR "./share/doc/${CPACK_PACKAGE_NAME}/")
-+  ENDIF()
-+
-   INSTALL(FILES
--          ${CMAKE_SOURCE_DIR}/COPYING
-           ${CMAKE_SOURCE_DIR}/README
-           DESTINATION
--          ./share/doc/${CPACK_PACKAGE_NAME}/
-+          ${INSTALL_DOC_DIR}
-           COMPONENT Documentation)
-+  INSTALL(FILES
-+          ${CMAKE_SOURCE_DIR}/COPYING
-+          DESTINATION
-+          ${INSTALL_LICENSE_DIR}
-+          COMPONENT Documentation)
-+
- ENDIF()
- 
- # Tests. Checking if we have them. May be not the case if we are building from source package
diff --git a/mariadb-connector-odbc.spec b/mariadb-connector-odbc.spec
index a9252c6..9801641 100644
--- a/mariadb-connector-odbc.spec
+++ b/mariadb-connector-odbc.spec
@@ -2,8 +2,8 @@
 %bcond_with     debug
 
 Name:           mariadb-connector-odbc
-Version:        3.1.1
-Release:        5%{?with_debug:.debug}%{?dist}
+Version:        3.1.2
+Release:        1%{?with_debug:.debug}%{?dist}
 Summary:        The MariaDB Native Client library (ODBC driver)
 License:        LGPLv2+
 Source:         https://downloads.mariadb.org/f/connector-odbc-%{version}/%{name}-%{version}-ga-src.tar.gz
@@ -14,8 +14,6 @@ BuildRequires:  cmake unixODBC-devel gcc-c++
 BuildRequires:  mariadb-connector-c-devel >= 3.0.6
 
 Patch1:         libraries_include_path.patch
-# Reported upstream JIRA: ODBC-258
-Patch2:         cmake_docdir_licensedir_configurable.patch
 
 %description
 MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using
@@ -26,7 +24,6 @@ and it supports both Unicode and ANSI modes.
 %prep
 %setup -q -n %{name}-%{version}-ga-src
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{set_build_flags}
@@ -54,11 +51,6 @@ cmake -L .
 %install
 %make_install
 
-# Can be commented out thanks to Patch2.
-# Can be dropped if upstream accept the patch (https://jira.mariadb.org/browse/ODBC-258)
-  # The %%doc and %%license files are installed to the wrong location by default
-  # rm %{buildroot}%{_datadir}/doc/mariadb_connector_odbc/{README,COPYING}
-
 %files
 %license COPYING
 %doc     README
@@ -69,6 +61,10 @@ cmake -L .
 
 
 %changelog
+* Wed Jul 31 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-1
+- Rebase to 3.1.2
+- Patch2 upstreamed
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index a4522c1..c43a625 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-connector-odbc-3.1.1-ga-src.tar.gz) = 4532dbbaf8d46c17fa85399fc5003fe6cbb8b5695d73ca9c87cdc3b74ab3250f9af21a1337f1d1e51fbe75b0cffcf4ba3fabd1a43ad3313854f58adeebceaaa3
+SHA512 (mariadb-connector-odbc-3.1.2-ga-src.tar.gz) = 5abe4065fa8f537d8ec5cbab42c7972c27969e7110152193e9f9e3c058f170dba00ce38cf5e2f68e414f59824000741aecf9729003cf074a1b8d2ced4dc0eb68