diff --git a/mariadb.changes b/mariadb.changes
index e42f6ae..7ddfcb9 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Nov 13 17:40:37 UTC 2013 - klaussfreire@gmail.com
+
+- Fix perl shebangs
+
+-------------------------------------------------------------------
+Wed Nov 13 16:45:10 UTC 2013 - klaussfreire@gmail.com
+
+- bnc#829430: Move libmysqlclient.so and libmysqlclient_r.so from
+  libmysqlclient-devel into libmysqlclient18 and libmysqlclient_r18
+  subpackages respectively
+
 -------------------------------------------------------------------
 Mon Sep 23 10:46:28 UTC 2013 - bbrunner@suse.com
 
diff --git a/mariadb.spec b/mariadb.spec
index 0736a9d..1216a8f 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -406,6 +406,10 @@ done
 rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
 # Present only in newer MariaDB, big change, needs fixing & testing
 rm -rf storage/tokudb
+# Specify perl path on shebangs
+for i in `grep -Rl '^#!@PERL@$' .`; do
+	sed -i 's|#!@PERL@|/usr/bin/perl|' $i
+done
 
 %build
 %{expand:%(cat %_sourcedir/build.inc)}
@@ -544,8 +548,6 @@ fi
 %files -n libmysqlclient-devel -f libmysqlclient-devel.files
 %defattr(-, root, root)
 /usr/include/mysql
-%{_libdir}/libmysqlclient.so
-%{_libdir}/libmysqlclient_r.so
 %dir /usr/share/aclocal
 /usr/share/aclocal/mysql.m4
 
@@ -561,7 +563,7 @@ fi
 
 %files -n libmysqlclient18
 %defattr(-, root, root)
-%{_libdir}/libmysqlclient.so.*
+%{_libdir}/libmysqlclient.so*
 
 %if 0%{cluster} > 1
 %files -n libndbclient6
@@ -571,7 +573,7 @@ fi
 
 %files -n libmysqlclient_r18
 %defattr(-, root, root)
-%{_libdir}/libmysqlclient_r.so.*
+%{_libdir}/libmysqlclient_r.so*
 
 %files bench -f mysql-bench.files
 %defattr(-, root, root)