diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py
index e5588d488..31b4fb798 100755
--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -199,10 +199,10 @@ QT_PLUGINS = [
 ]
 
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_account_xmpp.so.dylib',
-  'libtomahawk_account_google.so.dylib',
-  'libtomahawk_account_twitter.so.dylib',
-  'libtomahawk_account_zeroconf.so.dylib',
+  'libtomahawk_account_xmpp.dylib',
+  'libtomahawk_account_google.dylib',
+  'libtomahawk_account_twitter.dylib',
+  'libtomahawk_account_zeroconf.dylib',
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
diff --git a/src/accounts/twitter/CMakeLists.txt b/src/accounts/twitter/CMakeLists.txt
index 3ad17a72a..253bd4e03 100644
--- a/src/accounts/twitter/CMakeLists.txt
+++ b/src/accounts/twitter/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
 qt4_wrap_cpp( twitterAccountMoc ${twitterAccountHeaders} )
 qt4_wrap_ui( twitterAccountUI_H ${twitterAccountUI} )
 qt4_add_resources( RC_SRCS "resources.qrc" )
-add_library( tomahawk_account_twitter MODULE ${twitterAccountUI_H} ${twitterAccountSources} ${twitterAccountMoc} ${RC_SRCS} )
+add_library( tomahawk_account_twitter SHARED ${twitterAccountUI_H} ${twitterAccountSources} ${twitterAccountMoc} ${RC_SRCS} )
 
 IF( WIN32 )
 SET( OS_SPECIFIC_LINK_LIBRARIES
diff --git a/src/accounts/xmpp/CMakeLists.txt b/src/accounts/xmpp/CMakeLists.txt
index ff1f5da2a..e5e4e29ea 100644
--- a/src/accounts/xmpp/CMakeLists.txt
+++ b/src/accounts/xmpp/CMakeLists.txt
@@ -37,7 +37,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
 qt4_wrap_cpp( xmppAccountMoc ${xmppAccountHeaders} )
 qt4_wrap_ui( xmppAccountUI_H ${xmppAccountUI} )
 qt4_add_resources( RC_SRCS "resources.qrc" )
-add_library( tomahawk_account_xmpp MODULE ${xmppAccountUI_H} ${xmppAccountSources} ${xmppAccountMoc} ${RC_SRCS} )
+add_library( tomahawk_account_xmpp SHARED ${xmppAccountUI_H} ${xmppAccountSources} ${xmppAccountMoc} ${RC_SRCS} )
 
 IF( WIN32 )
 SET( OS_SPECIFIC_LINK_LIBRARIES
diff --git a/src/accounts/xmpp/googlewrapper/CMakeLists.txt b/src/accounts/xmpp/googlewrapper/CMakeLists.txt
index a2ce9560b..62a7e6c25 100644
--- a/src/accounts/xmpp/googlewrapper/CMakeLists.txt
+++ b/src/accounts/xmpp/googlewrapper/CMakeLists.txt
@@ -25,7 +25,7 @@ add_definitions(-DGOOGLE_WRAPPER)
 qt4_add_resources( RCX_SRCS "resources.qrc" )
 
 qt4_wrap_cpp( googleMoc ${googleHeaders} )
-add_library( tomahawk_account_google MODULE ${googleSources} ${googleMoc} ${googleMoc} ${RCX_SRCS} )
+add_library( tomahawk_account_google SHARED ${googleSources} ${googleMoc} ${googleMoc} ${RCX_SRCS} )
 
 target_link_libraries( tomahawk_account_google
     ${QT_LIBRARIES}
diff --git a/src/accounts/zeroconf/CMakeLists.txt b/src/accounts/zeroconf/CMakeLists.txt
index 772a24350..dd30fe31e 100644
--- a/src/accounts/zeroconf/CMakeLists.txt
+++ b/src/accounts/zeroconf/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
 qt4_wrap_ui( UI_SRCS configwidget.ui )
 qt4_add_resources( RC_SRCS "resources.qrc" )
 qt4_wrap_cpp( zeroconfMoc ${zeroconfHeaders} )
-add_library( tomahawk_account_zeroconf MODULE ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} )
+add_library( tomahawk_account_zeroconf SHARED ${zeroconfSources} ${zeroconfMoc} ${RC_SRCS} ${UI_SRCS} )
 
 IF( WIN32 )
 SET( OS_SPECIFIC_LINK_LIBRARIES
@@ -44,4 +44,4 @@ IF( APPLE )
 #  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
 ENDIF( APPLE )
 
-install( TARGETS tomahawk_account_zeroconf DESTINATION ${CMAKE_INSTALL_LIBDIR} )
\ No newline at end of file
+install( TARGETS tomahawk_account_zeroconf DESTINATION ${CMAKE_INSTALL_LIBDIR} )