diff --git a/srcpkgs/quassel-client b/srcpkgs/quassel-client
new file mode 120000
index 00000000000..416c90438d7
--- /dev/null
+++ b/srcpkgs/quassel-client
@@ -0,0 +1 @@
+quassel
\ No newline at end of file
diff --git a/srcpkgs/quassel-client-shared b/srcpkgs/quassel-client-shared
new file mode 120000
index 00000000000..416c90438d7
--- /dev/null
+++ b/srcpkgs/quassel-client-shared
@@ -0,0 +1 @@
+quassel
\ No newline at end of file
diff --git a/srcpkgs/quassel-core b/srcpkgs/quassel-core
new file mode 120000
index 00000000000..416c90438d7
--- /dev/null
+++ b/srcpkgs/quassel-core
@@ -0,0 +1 @@
+quassel
\ No newline at end of file
diff --git a/srcpkgs/quassel-shared b/srcpkgs/quassel-shared
new file mode 120000
index 00000000000..416c90438d7
--- /dev/null
+++ b/srcpkgs/quassel-shared
@@ -0,0 +1 @@
+quassel
\ No newline at end of file
diff --git a/srcpkgs/quassel/files/quasselcore/run b/srcpkgs/quassel/files/quasselcore/run
new file mode 100644
index 00000000000..072d22b45df
--- /dev/null
+++ b/srcpkgs/quassel/files/quasselcore/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+for dir in lib log; do
+	if [ ! -d /var/${dir}/quassel ]; then
+		mkdir /var/${dir}/quassel &&
+			chown -R quassel:quassel /var/${dir}/quassel &&
+			chmod 750 /var/${dir}/quassel
+	fi
+done
+exec chpst -u quassel quasselcore \
+    --logfile=/var/log/quassel/quasselcore.log \
+    --configdir=/var/lib/quassel \
+    --require-ssl
diff --git a/srcpkgs/quassel/template b/srcpkgs/quassel/template
index 7da63f23393..84a530dc147 100644
--- a/srcpkgs/quassel/template
+++ b/srcpkgs/quassel/template
@@ -1,17 +1,61 @@
 # Template file for 'quassel'
-
 pkgname=quassel
 version=0.12.2
-revision=1
+revision=2
 build_style=cmake
-short_desc="A simple irc client that doesnt need a Quasselcore"
-maintainer="Philipp Hirsch <itself@hanspolo.net>"
+_desc="Modern, cross-platform, distributed graphical IRC client"
+short_desc="${_desc} - standalone client"
+maintainer="Toyam Cox <Vaelatern@gmail.com>"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel qt-devel libdbusmenu-qt-devel phonon-devel qca-devel"
+_common_deps="desktop-file-utils"
+depends="${_common_deps} qt-plugin-sqlite quassel-client-shared>=${version}_${revision}"
 license="GPL-3"
+configure_args="-DEMBED_DATA=1 -DWANT_QTCLIENT=ON -DWANT_MONO=ON -DWANT_CORE=ON -DWITH_OPENSSL=ON -DWITH_DBUS=ON -DWITH_PHONON=ON -DWITH_WEBKIT=ON"
+system_accounts="quassel"
 homepage="http://www.quassel-irc.org"
-wrksrc="quassel-${version}"
 distfiles="http://quassel-irc.org/pub/quassel-${version}.tar.bz2"
 checksum="6bd6f79ecb88fb857bea7e89c767a3bd0f413ff01bae9298dd2e563478947897"
-hostmakedepends="cmake pkg-config"
-makedepends="zlib-devel qt-devel libdbusmenu-qt-devel phonon-devel qca-devel"
-depends="desktop-file-utils qt-plugin-sqlite"
-configure_args="-DEMBED_DATA=1 -DWANT_QTCLIENT=OFF -DWANT_MONO=ON -DWANT_CORE=OFF -DWITH_OPENSSL=ON -DWITH_DBUS=ON -DWITH_PHONON=ON -DWITH_WEBKIT=ON"
+
+post_install() {
+	vsv quasselcore
+}
+
+quassel-shared_package() {
+	short_desc="${_desc} - common files"
+	unset depends
+	pkg_install() {
+		vmove /usr/share/icons
+		vmove /usr/share/pixmaps
+	}
+}
+
+quassel-client-shared_package() {
+	short_desc="${_desc} - common client files"
+	depends="quassel-shared>=${version}_${revision}"
+	pkg_install() {
+		vmove /usr/share/quassel
+	}
+}
+
+quassel-core_package() {
+	replaces="quasselcore>=0"
+	conflicts="quasselcore>=0"
+	depends="${_common_deps} qt-plugin-sqlite quassel-shared>=${version}_${revision}"
+	short_desc="${_desc} - server"
+	pkg_install() {
+		vmove /usr/bin/quasselcore
+		vmove /etc/sv
+	}
+}
+
+quassel-client_package() {
+	replaces="quasselclient>=0"
+	conflicts="quasselclient>=0"
+	depends="${_common_deps} quassel-client-shared>=${version}_${revision}"
+	short_desc="${_desc} - distributed client"
+	pkg_install() {
+		vmove /usr/share/applications/quasselclient.desktop
+		vmove /usr/bin/quasselclient
+	}
+}