diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 698a0b01ec..6d727f30f2 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -19,9 +19,9 @@ distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=06fb4b9a1137b77a53e94eb69e4aeedd8f92d1bd1cfa0175f607660dd3b30818
 
 post_install() {
-        # Fix broken pkg-config
-        sed -i "s|^Requires: gio-2.0, , |Requires: gio-2.0, mozilla-nspr, mozilla-nss|" \
-                $DESTDIR/usr/lib/pkgconfig/evolution-data-server-1.2.pc
+	# Fix broken pkg-config
+	sed -i "s|^Requires: gio-2.0, , |Requires: gio-2.0, mozilla-nspr, mozilla-nss|" \
+		$DESTDIR/usr/lib/pkgconfig/evolution-data-server-1.2.pc
 }
 
 evolution-data-server-devel_package() {
diff --git a/srcpkgs/evolution-devel b/srcpkgs/evolution-devel
new file mode 120000
index 0000000000..cbf0fe2241
--- /dev/null
+++ b/srcpkgs/evolution-devel
@@ -0,0 +1 @@
+evolution
\ No newline at end of file
diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template
index f8edbbf036..16221967ca 100644
--- a/srcpkgs/evolution/template
+++ b/srcpkgs/evolution/template
@@ -21,9 +21,13 @@ homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=6a6996ed350e2bc09ecb63befdbc9cfbd9d1097e0ff77033e9bafd1f7b5a6414
 
-post_install() {
-	# Remove devel stuff, not interested.
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
-	rm -rf ${DESTDIR}/usr/share/gtk-doc
+evolution-devel_package() {
+	depends="GConf-devel gtkhtml-devel>=4.6.0 evolution-data-server-devel>=3.12
+	 gnome-desktop-devel>=3.12 ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/share/gtk-doc
+	}
 }