diff --git a/audio/tomahawk/Makefile b/audio/tomahawk/Makefile
index 19c5e7cae9da..5a509806d42a 100644
--- a/audio/tomahawk/Makefile
+++ b/audio/tomahawk/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.7.0
 PORTREVISION=	2
 CATEGORIES=	audio
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Multi-source, social, and smart music player
 
 LICENSE=	GPLv3
@@ -25,6 +25,7 @@ RUN_DEPENDS=	qca-ossl>=2.0.0.b3_4:${PORTSDIR}/security/qca-ossl
 
 CMAKE_ARGS+=	-DWITH_BREAKPAD:BOOL="OFF" \
 		-DCLUCENE_CONFIG_PATH:PATH="${LOCALBASE}/share/clucene"
+CXXFLAGS+=	-Wno-cast-align
 
 GH_ACCOUNT=	tomahawk-player
 GH_PROJECT=	${PORTNAME}
@@ -36,14 +37,14 @@ OPTIONS_DEFINE=	QTWEETLIB
 OPTIONS_DEFAULT=	GSTREAMER QTWEETLIB
 OPTIONS_RADIO=	 PHONON
 OPTIONS_RADIO_PHONON=	GSTREAMER VLC XINE
+OPTIONS_SUB=	yes
 QTWEETLIB_DESC=	Enable Twitter SIP plugin
 VLC_DESC=	Multimedia support for VLC
 
 PLIST_SUB+=	DESKTOPDIR=${DESKTOPDIR:S,^${PREFIX}/,,} \
 		PORTVERSION=${PORTVERSION}
 
-USES=		cmake pkgconfig
-NO_STAGE=	yes
+USES=		cmake pkgconfig desktop-file-utils
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/tomahawk/pkg-plist b/audio/tomahawk/pkg-plist
index 68ec9a52c8f6..c9c9fac28737 100644
--- a/audio/tomahawk/pkg-plist
+++ b/audio/tomahawk/pkg-plist
@@ -304,7 +304,7 @@ lib/cmake/Tomahawk/TomahawkLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Tomahawk/TomahawkLibraryDepends.cmake
 lib/cmake/Tomahawk/TomahawkUse.cmake
 lib/libtomahawk_account_google.so
-lib/libtomahawk_account_twitter.so
+%%QTWEETLIB%%lib/libtomahawk_account_twitter.so
 lib/libtomahawk_account_xmpp.so
 lib/libtomahawk_account_zeroconf.so
 lib/libtomahawk_infoplugin_charts.so