diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template
index d63b750e86..ea8d5d6d54 100644
--- a/srcpkgs/xf86-video-nouveau/template
+++ b/srcpkgs/xf86-video-nouveau/template
@@ -1,8 +1,9 @@
 # Template build file for 'xf86-video-nouveau'.
 pkgname=xf86-video-nouveau
 _distver=0.0.16
-_gitver=20110620
+_gitver="$(date +%Y%m%d)"
 version=${_distver}.${_gitver}
+build_wrksrc=nouveau
 build_style=gnu_configure
 short_desc="Xorg OpenSource NVIDIA video driver"
 maintainer="Mike Rosset <mike.rosset@gmail.com>"
@@ -14,6 +15,7 @@ long_desc="
  free software stack, nouveau."
 
 nofetch=yes
+noextract=yes
 
 Add_dependency run glibc
 Add_dependency run libdrm
@@ -26,17 +28,17 @@ Add_dependency build pkg-config
 Add_dependency build libdrm-devel
 Add_dependency build libudev-devel
 Add_dependency build xorg-server-devel
-
+Add_dependency build xorg-util-macros
 
 do_fetch()
 {
 	local gitrepo="git://anongit.freedesktop.org/nouveau/xf86-video-nouveau"
 
 	msg_normal "Fetching source from git repo at: $gitrepo\n"
-	git clone -v --depth 1 $gitrepo ${pkgname}-${version}
+	cd ${wrksrc} && git clone -v --depth 1 $gitrepo ${build_wrksrc}
 }
 
 pre_configure()
 {
-	./autogen.sh --prefix=/usr
+	cd ${build_wrksrc} && autoreconf -fi
 }