diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 7b37bae47..d19cac2c5 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,14 +1,14 @@
 # $Id$
-# Maintainer: Vesa Kaihlavirta
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Patrick Smits <mail@patricksmits.net>
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.com>
 #  - remove -m32 command from configure
 
 pkgname=yaws
-pkgver=1.95
-pkgrel=5
+pkgver=1.96
+pkgrel=1
 pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
 arch=('x86_64' 'i686')
 url='http://yaws.hyber.org/'
@@ -20,18 +20,25 @@ install=$pkgname.install
 optdepends=('erlang-nox: Erlang without X (headless)')
 source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha256sums=('e4efae836561f5e8a1324a5c9ab63fb82468e9dc93dc95cb4cb6248ab6b95406'
+sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2'
             '3f8347add6e3741e77f7bb9ba6b31feb1c878e2e58ecf19063891e801fa24698')
 
-build() {
+prepare() {
   cd "$pkgname-$pkgver"
 
-  sed -i 's/\-m32//g' configure
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   # python2 fix
   for file in cgi.yaws cgi-bin/foo.py; do
 	  sed -i '0,/on/s//on2/' "www/$file"
   done
+
+  # remove m32
+  sed -i 's/\-m32//g' configure
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }