diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 752326fdbca..215c00798a4 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -1,8 +1,8 @@
 # Template file for 'dovecot'
 pkgname=dovecot
-version=2.0.18
+version=2.1.1
 homepage="http://dovecot.org"
-distfiles="$homepage/releases/2.0/$pkgname-$version.tar.gz"
+distfiles="$homepage/releases/2.1/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
 --disable-static --with-nss --with-pam --with-mysql --with-pgsql
@@ -12,7 +12,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
 short_desc="IMAP and POP3 server written with security primarily in mind"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1"
-checksum=92fc68af6ef0309990c749fcab39eeebce56ea8888c3d73ba812b65a74d1fa1b
+checksum=f233a2d40f86785b0e568291a08312d5c15247c12de011be916c1eaf96276191
 long_desc="
  Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-like
  systems, written with security primarily in mind. Dovecot is an excellent
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index 3a9a92fe0a9..009ada65b6e 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -2,13 +2,13 @@
 #
 pkgname=kernel
 _kmajorver=3.2
-version=${_kmajorver}.7
+version=${_kmajorver}.8
 wrksrc="linux-${version}"
 distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
-checksum=9b859cf2d55b2b5e6ca103cc12932494c469b184a67bf0481448d78790c6a383
+checksum=b93b02f9cfaf4bca17d8d87a3170b94b29ec58ede15e9dc241740cb7860aa0ba
 short_desc="The Linux kernel and modules"
 long_desc="
  This package provides the linux kernel image and associated modules."
@@ -23,19 +23,11 @@ patch_args="-Np1"
 
 #: ${revision:=1}
 _kernel_headers_revision=${revision}
-if [ -n "${_kernel_snapshot}" ]; then
-	if [ -n "${_kernel_patch_ver}" ]; then
-		_kernver="${_kernel_ver}.${_kernel_ver_minor}-${_kernel_patch_ver}"
-	else
-		_kernver="${_kernel_ver}.${_kernel_ver_minor}"
-	fi
+if [ -n "${revision}" ]; then
+	_kernver="${version}_${revision}"
 else
 	_kernver="${version}"
 fi
-if [ -n "${revision}" ]; then
-	_kernver="${_kernver}_${revision}"
-fi
-kernel_hooks_version="${_kernver}"
 
 # These files could be modified when an external module is built.
 mutable_files="