diff --git a/.gitignore b/.gitignore
index d99db08..4285ff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mariadb_client-2.0.0-src.tar.gz
 /mariadb-connector-c-2.1.0-src.tar.gz
+/mariadb-connector-c-2.3.1-src.tar.gz
diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index 686486a..ac63b1b 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -1,23 +1,22 @@
-Summary: The MariaDB Native Client library (C driver)
-Name: mariadb-connector-c
-Version: 2.1.0
-Release: 2%{?dist}
-
-License: LGPLv2+
-Group: Applications/Databases
-Source: https://downloads.mariadb.org/f/connector-c-2.1.0/source-tgz/mariadb-connector-c-%{version}-src.tar.gz 
-Url: https://mariadb.org/en/
-BuildRequires: zlib-devel cmake openssl-devel
+Name:		mariadb-connector-c
+Version:	2.3.1
+Release:	1%{?dist}
+Summary:	The MariaDB Native Client library (C driver)
+Group:		Applications/Databases
+License:	LGPLv2+
+Source:		http://mirror.hosting90.cz/mariadb//connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz	# Later it will probabbly move to http://archive.mariadb.org//connector-c-2.3.1/source-tgz/mariadb-connector-c-2.3.1-src.tar.gz 
+Url:		https://mariadb.org/en/
+BuildRequires:	zlib-devel cmake openssl-devel
 
 %description
 The MariaDB Native Client library (C driver) is used to connect applications
 developed in C/C++ to MariaDB and MySQL databases.
 
 %package devel
-Summary: Development files for mariadb-connector-c.
-Group: Development/Libraries 
+Summary:	Development files for mariadb-connector-c.
+Group:		Development/Libraries
+BuildRequires:	xmlto
 Requires: %{name} = %{version}-%{release}
-BuildRequires: xmlto
 
 %description devel
 Development files for mariadb-connector-c.
@@ -39,18 +38,18 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmariadbclient.a 
+rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmariadbclient.a	# static linked libraries
 rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient.a
+rm /$RPM_BUILD_ROOT%{_libdir}/mariadb/libmysqlclient_r.a
 #
-rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile.am 
-rm -r /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeFiles 
-rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/mysql_version.h.in 
-rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile 
-rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeLists.txt 
-rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/my_config.h.in 
+rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile.am		# Makefile.am is a programmer-defined file and is used by automake to generate the Makefile.in
+rm -r /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeFiles
+rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/mysql_version.h.in	# *.in files are produced while creating final *.h files
+rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/Makefile
+rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/CMakeLists.txt
+rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/my_config.h.in
 rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
 
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/mariadb/libmariadb.so.2
@@ -63,10 +62,12 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
 %{_libdir}/mariadb/libmariadb.so
 %{_libdir}/mariadb/libmysqlclient_r.so
 %{_libdir}/mariadb/libmysqlclient.so
-%{_libdir}/mariadb/libmysql.so
 %{_includedir}/mariadb
 
 %changelog
+* Tue Sep 13 2016 Michal Schorm <mschorm@redhat.com> - 2.3.1-1
+- Rebase to version 2.3.1
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
@@ -81,4 +82,3 @@ rm /$RPM_BUILD_ROOT%{_includedir}/mariadb/cmake_install.cmake
 
 * Tue Aug 26 2014 Matej Mužila <mmuzila@redhat.com> - 2.0.0-2
 - Initial version for 2.0.0
-
diff --git a/sources b/sources
index 44dd183..b58b73b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c026525ad2cec882b00070ba92fa0bc1  mariadb-connector-c-2.1.0-src.tar.gz
+26a491253bd93a3831cdfc077a83ccc7  mariadb-connector-c-2.3.1-src.tar.gz