diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template
index fd0308d45ca..6b0450c3f8b 100644
--- a/srcpkgs/p7zip/template
+++ b/srcpkgs/p7zip/template
@@ -2,7 +2,7 @@
 pkgname=p7zip
 version=9.20.1
 wrksrc=${pkgname}_${version}
-revision=2
+revision=3
 hostmakedepends="yasm nasm"
 short_desc="Command-line version of the 7zip compressed file archive"
 homepage="http://p7zip.sourceforge.net/"
@@ -11,21 +11,21 @@ maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 checksum=49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
 
-do_build() {
+do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		i686*) cp makefile.linux_x86_asm_gcc_4.X makefile.machine;;
 		x86_64*) cp makefile.linux_amd64_asm makefile.machine;;
 		*) cp makefile.linux_any_cpu_gcc_4.X makefile.machine;;
 	esac
-	sed -i "s|usr/local|usr|g" makefile
-
-	make all4 CXX="$CXX" OPTFLAGS="${CXXFLAGS}" UNICODE=1
+	sed -e 's,-s ,,' -i makefile.machine
+	sed -e "s,g++,${CXX}," -i makefile.machine
+	sed -e "s,gcc,${CC}," -i makefile.machine
+}
+do_build() {
+	make all3 OPTFLAGS="$CXXFLAGS"
 }
-
 do_install() {
-	make install DEST_HOME="${DESTDIR}/usr" \
-		DEST_MAN="${DESTDIR}/usr/share/man" \
-		DEST_SHARE_DOC="${DESTDIR}/usr/share/doc/${pkgname}"
-
-	sed "s|${DESTDIR}/usr|/usr|g" -i ${DESTDIR}/usr/bin/7z{,a,r}
+	make install DEST_DIR="${DESTDIR}" DEST_HOME="/usr" \
+		DEST_MAN="/usr/share/man" \
+		DEST_SHARE_DOC="/usr/share/doc/${pkgname}"
 }