diff --git a/src/accounts/twitter/CMakeLists.txt b/src/accounts/twitter/CMakeLists.txt
index c0a506395..558054b0a 100644
--- a/src/accounts/twitter/CMakeLists.txt
+++ b/src/accounts/twitter/CMakeLists.txt
@@ -1,58 +1,19 @@
-project( tomahawk )
 
-include( ${QT_USE_FILE} )
-add_definitions( ${QT_DEFINITIONS} )
-add_definitions( -DQT_PLUGIN )
-add_definitions( -DQT_SHARED )
-add_definitions( -DACCOUNTDLLEXPORT_PRO )
+include_directories(${QTWEETLIB_INCLUDE_DIR})
 
-set( twitterAccountSources
-    TwitterAccount.cpp
-    TwitterInfoPlugin.cpp
-    TwitterConfigWidget.cpp
-    TomahawkOAuthTwitter.cpp
-    sip/TwitterSip.cpp
+add_tomahawk_plugin(twitter
+    TYPE account
+    EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
+    SOURCES
+        TwitterAccount.cpp
+        TwitterInfoPlugin.cpp
+        TwitterConfigWidget.cpp
+        TomahawkOAuthTwitter.cpp
+        sip/TwitterSip.cpp
+    UI
+        TwitterConfigWidget.ui
+    LINK_LIBRARIES
+        ${TOMAHAWK_LIBRARIES}
+        ${QTWEETLIB_LIBRARIES}
 )
 
-set( twitterAccountHeaders
-    TwitterAccount.h
-    TwitterInfoPlugin.h
-    TwitterConfigWidget.h
-    TomahawkOAuthTwitter.h
-    sip/TwitterSip.h
-)
-
-set( twitterAccountUI
-    TwitterConfigWidget.ui
-)
-
-include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
-   ${QT_INCLUDE_DIR}
-   ${QTWEETLIB_INCLUDE_DIR}
-)
-
-qt4_wrap_cpp( twitterAccountMoc ${twitterAccountHeaders} )
-qt4_wrap_ui( twitterAccountUI_H ${twitterAccountUI} )
-qt4_add_resources( RC_SRCS "resources.qrc" )
-add_library( tomahawk_account_twitter SHARED ${twitterAccountUI_H} ${twitterAccountSources} ${twitterAccountMoc} ${RC_SRCS} )
-
-IF( WIN32 )
-SET( OS_SPECIFIC_LINK_LIBRARIES
-        ${OS_SPECIFIC_LINK_LIBRARIES}
-        "winmm.dll"
-        "iphlpapi.a"
-)
-ENDIF( WIN32 )
-
-target_link_libraries( tomahawk_account_twitter
-    ${TOMAHAWK_LIBRARIES}
-    ${QTWEETLIB_LIBRARIES}
-    ${QT_LIBRARIES}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-)
-
-IF( APPLE )
-#  SET( CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-undefined dynamic_lookup" )
-ENDIF( APPLE )
-
-install( TARGETS tomahawk_account_twitter DESTINATION ${CMAKE_INSTALL_LIBDIR} )