diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index d6d0f9850a7..6a0fcf23bbf 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -1,7 +1,7 @@
 # Template file for 'emacs'
 pkgname=emacs
 version=24.3
-revision=6
+revision=7
 hostmakedepends="pkg-config"
 makedepends="ncurses-devel libXaw-devel gtk+-devel"
 depends="emacs-common-${version}_${revision}"
@@ -98,17 +98,24 @@ else
 	configure_args+=" --without-sound"
 fi
 
-do_configure() {
-	mkdir -p nox x11 gtk2
+pre_configure() {
+	# Just configuring in different directories results in
+	# spurious emacs rebuilds with incompatible build numbers.
+	mkdir -p nox
+	mv * nox || true
+	cp -a nox x11
+	cp -a nox gtk2 
+}
 
+do_configure() {
 	cd $wrksrc/nox
-	../configure --without-x ${configure_args} 
+	./configure --without-x ${configure_args} 
 
 	cd $wrksrc/x11
-	../configure --with-x-toolkit=athena --without-toolkit-scroll-bars ${configure_args} 
+	./configure --with-x-toolkit=athena --without-toolkit-scroll-bars ${configure_args} 
 
 	cd $wrksrc/gtk2
-	../configure --with-x-toolkit=gtk2 ${configure_args} 
+	./configure --with-x-toolkit=gtk2 ${configure_args} 
 }
 
 do_build() {