diff -u amarok-2.0.2mysql5.1.30/debian/rules amarok-2.0.2mysql5.1.30/debian/rules
--- amarok-2.0.2mysql5.1.30/debian/rules
+++ amarok-2.0.2mysql5.1.30/debian/rules
@@ -135,7 +135,8 @@
 
 	cd mysql*/; $(MAKE) install DESTDIR=$(CURDIR)/debian/tmpmysql
 
-	-cd amarok*/; patch -p1 < ../debian/patches-amarok/02_mysqle_fix_linkage.diff
+	# -cd amarok*/; patch -p1 < ../debian/patches-amarok/02_mysqle_fix_linkage.diff
+	-cd amarok*/; patch -p1 < ../debian/patches-amarok/03_mysqle_link_to_amarok_executable.diff
 	-cd amarok*/; patch -p1 < ../debian/patches-amarok/kubuntu_03_restricted_install.diff
 	-cd amarok*/; patch -p1 < ../debian/patches-amarok/kubuntu_04_libgpod_0.7.diff
 	-cd amarok*/; patch -p1 < ../debian/patches-amarok/kubuntu_05_wikipaedia.diff
diff -u amarok-2.0.2mysql5.1.30/debian/changelog amarok-2.0.2mysql5.1.30/debian/changelog
--- amarok-2.0.2mysql5.1.30/debian/changelog
+++ amarok-2.0.2mysql5.1.30/debian/changelog
@@ -1,3 +1,12 @@
+amarok (2:2.0.2mysql5.1.30-0ubuntu2) jaunty; urgency=low
+
+  * Link libmysqld to amarok executable (patch
+    03_mysqle_link_to_amarok_executable.diff from Debian) Fixes crashes on 
+    startup for PowerPC (LP: #319331)
+  * Disable 02_mysqle_fix_linkage.diff, kinda depreciated by the above
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Wed, 18 Mar 2009 14:18:29 -0400
+
 amarok (2:2.0.2mysql5.1.30-0ubuntu1) jaunty; urgency=low
 
   [ Steve Stalcup ]
only in patch2:
unchanged:
--- amarok-2.0.2mysql5.1.30.orig/debian/patches-amarok/03_mysqle_link_to_amarok_executable.diff
+++ amarok-2.0.2mysql5.1.30/debian/patches-amarok/03_mysqle_link_to_amarok_executable.diff
@@ -0,0 +1,54 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -640,6 +640,16 @@
+ else(Q_WS_MAC)
+     kde4_add_executable(amarok ${amarok_SRCS})
+     target_link_libraries(amarok ${KDE4_KDEUI_LIBS} amaroklib )
++    # Link MySQLe to the executable. Hence -fPIC for libmysqld is not
++    # needed anymore.
++    target_link_libraries(amarok -Wl,-whole-archive ${MYSQL_EMBEDDED_LIBRARIES} -Wl,-no-whole-archive)
++    if(NOT WIN32)
++        if(NOT APPLE)
++            target_link_libraries(amarok crypt pthread dl wrap)
++        endif(NOT APPLE)
++    endif(NOT WIN32)
++    set_target_properties(amarok PROPERTIES LINK_FLAGS "-Wl,--allow-multiple-definition")
++
+     install(TARGETS amarok ${INSTALL_TARGETS_DEFAULT_ARGS})
+ endif(Q_WS_MAC)
+ 
+--- a/src/collection/sqlcollection/CMakeLists.txt
++++ b/src/collection/sqlcollection/CMakeLists.txt
+@@ -56,29 +56,17 @@
+ STRING(REPLACE "-Wl,--fatal-warnings" "" CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN ${CMAKE_MODULE_LINKER_FLAGS})
+ SET(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN} )
+ 
++STRING(REPLACE "-Wl,--no-undefined" "" CMAKE_MODULE_LINKER_FLAGS_ALLOW_UNDEFINED ${CMAKE_MODULE_LINKER_FLAGS})
++SET(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_ALLOW_UNDEFINED} )
++
+ target_link_libraries(amarok_collection-sqlcollection
+     amaroklib
+     amarokpud
+     ${KDE4_KDEUI_LIBS}
+     ${KDE4_KIO_LIBS}
+     ${KDE4_THREADWEAVER_LIBRARIES}
+-    ${CMAKE_DL_LIBS}
+-    ${MYSQL_EMBEDDED_LIBRARIES}
+-    #this line may be needed on Debian or other systems where mysql is compiled
+-    #in the prescence of yassl. However it seems to cause problems for other people,
+-    #so its been disabled.
+-    #See http://bugs.mysql.com/bug.php?id=21489
+-    ${MYSQL_LIBRARIES}
+-    ${ZLIB_LIBRARIES}
+ )
+ 
+-if(NOT WIN32)
+-    target_link_libraries(amarok_collection-sqlcollection crypto ssl)
+-    if(NOT APPLE)
+-        target_link_libraries(amarok_collection-sqlcollection crypt pthread)
+-    endif(NOT APPLE)
+-endif(NOT WIN32)
+-
+ if(APPLE)
+ 	SET_TARGET_PROPERTIES(amarok_collection-sqlcollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif(APPLE)