diff --git a/build.inc b/build.inc
index ab744fd..03d8b77 100644
--- a/build.inc
+++ b/build.inc
@@ -114,8 +114,8 @@ BuildMySQL() {
 			-DWITH_EMBEDDED_SERVER=true                                  \
 			-DCOMPILATION_COMMENT="openSUSE package"                     \
 			-DDENABLE_DOWNLOADS=false                                    \
-			-DINSTALL_PLUGINDIR_RPM="%{_libdir}/mysql/plugin"            \
-			-DINSTALL_LIBDIR_RPM="%{_libdir}"                            \
+			-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin"            \
+			-DINSTALL_LIBDIR_RPM="%{_lib}"                            \
 			"$@" ..
 	make %{?jobs:-j%jobs}
 	nm --numeric-sort sql/mysqld > sql/mysqld.sym
diff --git a/install.inc b/install.inc
index 12760e6..5742bbc 100644
--- a/install.inc
+++ b/install.inc
@@ -125,23 +125,6 @@ cat mysql-ndb-storage.files mysql-ndb-management.files  \
 	rm -f .$tmp
 done
 %endif
-pushd '%buildroot'/%_libdir
-for i in *.so.*.*.*; do
-	if [ -L "$i" ]; then
-		trg="`readlink "$i"`"
-		rm "$i"
-		mv "$trg" "$i"
-		ln -s "$i" "$trg"
-	fi
-done
-for i in *.so.*; do
-	if [ -L "$i" ] && [ -L "`readlink "$i"`" ]; then
-		trg="`readlink "$i"`"
-		rm "$i"
-		ln -s "`readlink "$trg"`" "$i"
-	fi
-done
-popd
 %if ! 0%{prefered} > 0
 cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
 	cd '%buildroot'
diff --git a/mariadb.changes b/mariadb.changes
index 9416177..c8e2bed 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Aug 17 13:46:26 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Fix INSTALL_LIBDIR_RPM and INSTALL_PLUGINDIR_RPM, they need to
+  point to %_lib, not %_libdir
+- Drop so symlink generation and removal, that is not necessary and
+  breaks non x86_64 builds of dependent packages
+
 -------------------------------------------------------------------
 Mon Aug 12 14:32:51 CEST 2013 - mhrusecky@suse.cz