diff --git a/srcpkgs/vala-doc b/srcpkgs/vala-doc
new file mode 120000
index 00000000000..fbf62fb5b24
--- /dev/null
+++ b/srcpkgs/vala-doc
@@ -0,0 +1 @@
+vala
\ No newline at end of file
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index d0a40a2b24c..ecbbb8c1781 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,7 +1,7 @@
 # Template file for 'vala'
 pkgname=vala
 version=0.42.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-graphviz"
 hostmakedepends="flex libxslt pkg-config automake libtool"
@@ -29,21 +29,55 @@ pre_configure() {
 }
 
 libvala_package() {
-	short_desc+=" - shared library"
+	short_desc+=" - vala shared library"
 	pkg_install() {
-		vmove usr/lib/*.so.*
+		vmove "usr/lib/libvala-*.so.*"
+	}
+}
+
+valadoc_package() {
+	short_desc+=" - valadoc shared library"
+	pkg_install() {
+		vmove usr/bin/valadoc
+		vmove "usr/bin/valadoc-*"
+		vmove "usr/lib/libvaladoc-*.so.*"
+		vmove usr/lib/valadoc
+		vmove usr/share/valadoc
+		vmove usr/share/man/man1/valadoc.1
+		vmove "usr/share/man/man1/valadoc-*.1"
+	}
+}
+
+valadoc-devel_package() {
+	depends="valadoc-${version}_${revision}
+	 vala-devel-${version}_${revision}"
+	short_desc+=" - valadoc development files"
+	pkg_install() {
+		vmove "usr/include/valadoc-*"
+		vmove "usr/lib/libvaladoc-*.so"
+		vmove "usr/lib/pkgconfig/valadoc-*.pc"
+		vmove "usr/share/vala/vapi/valadoc-*.deps"
+		vmove "usr/share/vala/vapi/valadoc-*.vapi"
 	}
 }
 
 vala-devel_package() {
-	depends="libglib-devel vala>=${version}_${revision}"
-	short_desc+=" - development files"
+	depends="libglib-devel vala-${version}_${revision}"
+	short_desc+=" - vala development files"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove usr/lib/*.so
+		vmove "usr/lib/libvala-*.so"
+		vmove "usr/lib/pkgconfig/libvala*.pc"
+		vmove "usr/include/vala-*"
+		vmove "usr/share/vala/vapi/libvala-*.*"
 		vmove usr/share/aclocal
-		vmove usr/share/devhelp
-		vmove usr/share/vala
+	}
+}
+
+vala-doc_package() {
+	noarch=yes
+	depends="vala-${version}_${revision}"
+	short_desc+=" - devhelp documentation"
+	pkg_install() {
+		vmove usr/share/devhelp
 	}
 }
diff --git a/srcpkgs/valadoc b/srcpkgs/valadoc
new file mode 120000
index 00000000000..fbf62fb5b24
--- /dev/null
+++ b/srcpkgs/valadoc
@@ -0,0 +1 @@
+vala
\ No newline at end of file
diff --git a/srcpkgs/valadoc-devel b/srcpkgs/valadoc-devel
new file mode 120000
index 00000000000..fbf62fb5b24
--- /dev/null
+++ b/srcpkgs/valadoc-devel
@@ -0,0 +1 @@
+vala
\ No newline at end of file