diff --git a/srcpkgs/dovecot-devel b/srcpkgs/dovecot-devel
new file mode 120000
index 0000000000..abeb1d0499
--- /dev/null
+++ b/srcpkgs/dovecot-devel
@@ -0,0 +1 @@
+dovecot
\ No newline at end of file
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 3f821882a4..b4a85af7d3 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,7 +1,7 @@
 # Template file for 'dovecot'
 pkgname=dovecot
 version=2.2.18
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
  --disable-static --with-pam --with-mysql --with-pgsql
@@ -88,13 +88,20 @@ post_install() {
 	vinstall doc/mkcert.sh 755 usr/bin dovecot-mkcert.sh
 	rm ${DESTDIR}/etc/dovecot/README
 
-	# Remove development stuff.
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/share/aclocal
-
 	vsv dovecot
 }
 
+dovecot-devel_package() {
+	depends="dovecot>=${version}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/dovecot/dovecot-config
+	}
+}
+
+
 dovecot-plugin-ldap_package() {
 	depends="dovecot>=${version}"
 	short_desc+=" - LDAP plugin"