diff --git a/.SRCINFO b/.SRCINFO
index df4843124031..50cde94ce093 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = codemetre
 	pkgdesc = A console-based tool counting lines of code in a file
-	pkgver = 0.29.2
+	pkgver = 0.31.2
 	pkgrel = 1
 	url = http://wiki.github.com/seventh/codemetre
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	depends = glibc
-	source = http://codemetre.free.fr/codemetre-0.29.2.tar.bz2
-	md5sums = cad68e30055f49155c345e69429afac2
+	source = http://codemetre.free.fr/codemetre-0.31.2.tar.bz2
+	md5sums = 8037be694f697f00b98ba7fe262097f0
 
 pkgname = codemetre
 
diff --git a/PKGBUILD b/PKGBUILD
index 17ca94154e36..e51246b15f8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=codemetre
-pkgver=0.29.2
+pkgver=0.31.2
 pkgrel=1
 pkgdesc="A console-based tool counting lines of code in a file"
 arch=('i686' 'x86_64')
@@ -10,19 +10,23 @@ url="http://wiki.github.com/seventh/codemetre"
 license=('GPL3')
 depends=('glibc')
 source=(http://codemetre.free.fr/$pkgname-$pkgver.tar.bz2)
-md5sums=('cad68e30055f49155c345e69429afac2')
+md5sums=('8037be694f697f00b98ba7fe262097f0')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver/src/c
+  cd "${srcdir}"/$pkgname-$pkgver/src/c
 
   gcc ${CFLAGS} -Wall -c luat_$pkgname.c
   gcc ${CFLAGS} -Wall -o $pkgname luat_$pkgname.o -lm
-
-  install -Dm755 $pkgname ${pkgdir}/usr/bin/$pkgname
-
-  cd ${srcdir}/$pkgname-$pkgver
-  install -d ${pkgdir}/usr/share/{doc,man}
-  cp -rf doc/ ${pkgdir}/usr/share/doc/$pkgname/
-  cp -rf i18n/ ${pkgdir}/usr/share/locale/
-  cp -rf man/ ${pkgdir}/usr/share/man/man1/
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver/src/c
+
+  install -Dm755 $pkgname "${pkgdir}"/usr/bin/$pkgname
+
+  cd "${srcdir}"/$pkgname-$pkgver
+  install -d "${pkgdir}"/usr/share/{doc,man}
+  cp -rf doc/ "${pkgdir}"/usr/share/doc/$pkgname/
+  cp -rf i18n/ "${pkgdir}"/usr/share/locale/
+  cp -rf man/ "${pkgdir}"/usr/share/man/man1/
 }