diff --git a/sources b/sources
index 4ca57a5..4ad3cb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (unixODBC-2.3.7.tar.gz) = a87afeaaa0476f4ae6345c7021b3af52718944e599abb595c864d9126744a21341889802512a1de3ebaf86ac89e7f8b1bbd7f8f5285e8f4bccf928bd1585ff70
+SHA512 (unixODBC-2.3.9.tar.gz) = 6637eab751401522e0af775cb104cd07693b82927453a98e5af28e079f4b9f40e1cfab8cb36f509c46dced89b45244bc5ed1a3dda17ba5a52a844e8e82f187bb
diff --git a/unixODBC.spec b/unixODBC.spec
index 08bee6e..826e2df 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
 Summary: A complete ODBC driver manager for Linux
 Name: unixODBC
-Version: 2.3.7
-Release: 7%{?dist}
+Version: 2.3.9
+Release: 1%{?dist}
 URL: http://www.unixODBC.org/
 # Programs are GPL, libraries are LGPL, except News Server library is GPL.
 License: GPLv2+ and LGPLv2+
@@ -74,6 +74,14 @@ cp %{SOURCE5} README.dist
 # remove obsolete Postgres drivers from the package (but not the setup code)
 rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
 
+# make directory for unversioned plugins and create appropriate symlinks
+mkdir $RPM_BUILD_ROOT%{_libdir}/%{name}
+cd $RPM_BUILD_ROOT%{_libdir}/%{name}
+ln -s ../libodbcpsqlS.so.2.0.0 libodbcpsqlS.so
+ln -s ../libodbcmyS.so.2.0.0 libodbcmyS.so
+ln -s ../libtdsS.so.2.0.0 libtdsS.so
+cd -
+
 # copy text driver documentation into main doc directory
 # currently disabled because upstream no longer includes text driver
 # mkdir -p doc/Drivers/txt
@@ -95,9 +103,10 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > bas
 find $RPM_BUILD_ROOT%{_libdir} -name "*.so"   | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
 
 # move these to main package, they're often dlopened...
-for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so libtdsS.so
+for lib in libodbcpsqlS.so libodbcmyS.so libtdsS.so
 do
-    echo "%{_libdir}/$lib" >> base-so-list
+    echo "%{_libdir}/%{name}/$lib" >> base-so-list
+    rm -f $RPM_BUILD_ROOT%{_libdir}/$lib
     grep -v "/$lib$" devel-so-list > devel-so-list.x
     mv -f devel-so-list.x devel-so-list
 done
@@ -121,6 +130,10 @@ done
 %ldconfig_scriptlets
 
 %changelog
+* Thu Sep 10 2020 Ondrej Dubaj <odubaj@redhat.com> - 2.3.9-1
+- rebase to version 2.3.9
+- move unversioned *.so files back to *-devel package
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.7-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild