diff --git a/srcpkgs/cmus-faad b/srcpkgs/cmus-faad
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-faad
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-ffmpeg b/srcpkgs/cmus-ffmpeg
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-ffmpeg
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-flac b/srcpkgs/cmus-flac
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-flac
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-libao b/srcpkgs/cmus-libao
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-libao
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-modplug b/srcpkgs/cmus-modplug
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-modplug
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-mpc b/srcpkgs/cmus-mpc
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-mpc
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-opus b/srcpkgs/cmus-opus
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-opus
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-oss b/srcpkgs/cmus-oss
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-oss
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-pulseaudio b/srcpkgs/cmus-pulseaudio
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-pulseaudio
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus-wavpack b/srcpkgs/cmus-wavpack
new file mode 120000
index 0000000000..c299fe288c
--- /dev/null
+++ b/srcpkgs/cmus-wavpack
@@ -0,0 +1 @@
+cmus
\ No newline at end of file
diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template
index 06455aa90a..06b44cf662 100644
--- a/srcpkgs/cmus/template
+++ b/srcpkgs/cmus/template
@@ -1,10 +1,8 @@
 # Template file for 'cmus'
 pkgname=cmus
 version=2.5.0
-revision=2
+revision=3
 wrksrc="cmus-v${version}"
-build_style=configure
-configure_args="prefix=/usr"
 short_desc="Small, fast and powerful console music player"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,13 +10,97 @@ homepage="http://cmus.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/cmus/cmus-v${version}.tar.bz2"
 checksum=2021fab64088898d62d1439525ec345e219f58d91a9e933dc85e84eda21c8ddf
 
-makedepends="pkg-config faad2-devel libflac-devel libao-devel libmad-devel
+hostmakedepends="pkg-config"
+makedepends="faad2-devel libflac-devel libao-devel libmad-devel
  libmodplug-devel libmp4v2-devel>=2.0.0 libmpcdec-devel pulseaudio-devel
  opusfile-devel wavpack-devel alsa-lib-devel libvorbis-devel ffmpeg-devel
  ncurses-devel"
 
-cmus_package() {
+do_configure() {
+	./configure prefix=/usr
+}
+
+do_build() {
+	make GCC=$CC CC=$CC LD=$CC ${makejobs}
+}
+
+do_install() {
+	make DESTDIR=$DESTDIR install
+}
+
+cmus-libao_package() {
+	short_desc+=" - libao output plugin"
 	pkg_install() {
-		vmove usr
+		vmove usr/lib/cmus/op/ao.so
+	}
+}
+
+cmus-faad_package() {
+	short_desc+=" - AAC/MP4 input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/aac.so
+		vmove usr/lib/cmus/ip/mp4.so
+	}
+}
+
+cmus-ffmpeg_package() {
+	short_desc+=" - FFmpeg input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/ffmpeg.so
+	}
+}
+
+cmus-flac_package() {
+	short_desc+=" - FLAC input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/flac.so
+	}
+}
+
+cmus-mpc_package() {
+	short_desc+=" - MPC input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/mpc.so
+	}
+}
+
+cmus-modplug_package() {
+	short_desc+=" - MOD input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/modplug.so
+	}
+}
+
+cmus-opus_package() {
+	short_desc+=" - Opus input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/opus.so
+	}
+}
+
+cmus-oss_package() {
+	short_desc+=" - OSS output plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/op/oss.so
+	}
+}
+
+cmus-pulseaudio_package() {
+	short_desc+=" - Pulseaudio output plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/op/pulse.so
+	}
+}
+
+cmus-wavpack_package() {
+	short_desc+=" - Wavpack input plugin"
+	pkg_install() {
+		vmove usr/lib/cmus/ip/wavpack.so
+	}
+}
+
+cmus_package() {
+	pkg_install() {
+		vmove all
 	}
 }