diff --git a/srcpkgs/biew/template b/srcpkgs/biew/template
index d2b33a21b4..f232350f49 100644
--- a/srcpkgs/biew/template
+++ b/srcpkgs/biew/template
@@ -1,8 +1,8 @@
 # Template file for 'biew'
 pkgname=biew
 version=6.1.0
-_shortversion=${version//.}
 revision=3
+_shortversion=${version//.}
 wrksrc="${pkgname}-${_shortversion}"
 build_style=gnu-configure
 short_desc="Console hex viewer/editor and disassembler"
diff --git a/srcpkgs/get-flash-videos-git/template b/srcpkgs/get-flash-videos-git/template
index d25aee7639..8a16bc0e6d 100644
--- a/srcpkgs/get-flash-videos-git/template
+++ b/srcpkgs/get-flash-videos-git/template
@@ -1,9 +1,9 @@
 # Template file for 'get-flash-videos-git'
 pkgname=get-flash-videos-git
 version=20150420
+revision=1
 _githash=eae1ac23fcc4a31ead78bfdd99c6faae3bde4ab3
 wrksrc="get-flash-videos-${_githash}"
-revision=1
 noarch=yes
 hostmakedepends="perl"
 makedepends="perl-WWW-Mechanize perl-HTTP-Cookies perl-LWP-Protocol-https
diff --git a/srcpkgs/ksh/template b/srcpkgs/ksh/template
index e67104a32a..6456080426 100644
--- a/srcpkgs/ksh/template
+++ b/srcpkgs/ksh/template
@@ -1,8 +1,8 @@
 # Template file for 'ksh'
 pkgname=ksh
 version=2012.08.01
-_debpkgver=93u+20120801
 revision=4
+_debpkgver=93u+20120801
 wrksrc=${pkgname}-${_debpkgver}
 register_shell="/bin/ksh"
 short_desc="AT&T's Korn shell (ksh93)"
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index 33e37fde12..d8daa0772b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,9 @@
 pkgname=pandoc
 # Keep in sync with http://www.stackage.org/lts
 version=1.15.0.6
+revision=1
 _citeproc_version=0.7.3
 _stackage="lts-3.0"
-revision=1
 nocross=yes
 create_wrksrc=yes
 hostmakedepends="ghc stack hsb2hs"
diff --git a/srcpkgs/pflask-git/template b/srcpkgs/pflask-git/template
index e9ad785809..205c6e91af 100644
--- a/srcpkgs/pflask-git/template
+++ b/srcpkgs/pflask-git/template
@@ -1,9 +1,9 @@
 # Template file for 'pflask-git'
 pkgname=pflask-git
 version=20150513
+revision=1
 _githash=2d69096dc7e9bf2d833252445ce85a9ac020a535
 wrksrc="pflask-${_githash}"
-revision=1
 build_style=waf
 hostmakedepends="python python-Sphinx ca-certificates"
 short_desc="Simple tool for creating Linux namespace containers"
diff --git a/srcpkgs/plan9port/template b/srcpkgs/plan9port/template
index 5c273feecf..ec82e1e5a4 100644
--- a/srcpkgs/plan9port/template
+++ b/srcpkgs/plan9port/template
@@ -1,8 +1,8 @@
 # Template file for 'plan9port'
 pkgname=plan9port
 version=20150410
-_githash=3aca22118d808597bc7451adc559d89460ed5a6e
 revision=1
+_githash=3aca22118d808597bc7451adc559d89460ed5a6e
 wrksrc="${pkgname}-${_githash}"
 hostmakedepends="which perl"
 makedepends="libX11-devel libXt-devel libXext-devel freetype-devel fontconfig-devel"
diff --git a/srcpkgs/puzzles/template b/srcpkgs/puzzles/template
index 70634896cc..4770923d53 100644
--- a/srcpkgs/puzzles/template
+++ b/srcpkgs/puzzles/template
@@ -1,8 +1,8 @@
 # Template file for 'puzzles'
 pkgname=puzzles
 version=20150502
-wrksrc="${pkgname}-7f64f4a"
 revision=2
+wrksrc="${pkgname}-7f64f4a"
 hostmakedepends="pkg-config perl"
 makedepends="gtk+-devel"
 short_desc="Simon Tatham's Portable Puzzle Collection"
diff --git a/srcpkgs/pystopwatch/template b/srcpkgs/pystopwatch/template
index f8d8a970ae..03583bfb64 100644
--- a/srcpkgs/pystopwatch/template
+++ b/srcpkgs/pystopwatch/template
@@ -1,8 +1,8 @@
 # Template file for 'pystopwatch'
 pkgname=pystopwatch
 version=2012.12.24.1
-noarch=yes
 revision=1
+noarch=yes
 makedepends="pygtk-devel librsvg-devel"
 depends="python pygtk librsvg"
 short_desc="A GTK2+ stopwatch written in Python"