--- app-arch/zip/zip-2.32.ebuild
+++ app-arch/zip/zip-2.32.ebuild
@@ -21,17 +21,20 @@
 	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
 	epatch "${FILESDIR}"/${PN}-2.31-exec-stack.patch
 	epatch "${FILESDIR}"/${PN}-2.31-make.patch
-	cd unix
 	use crypt || append-flags -DNO_CRYPT
-	sed -i -e "s:-O2:${CFLAGS}:" Makefile
+
+	cat <<EOF>flags
+CC="$(tc-getCC)"
+CPP="$(tc-getCC) -E"
+CFLAGS="${CFLAGS} -I. -DUNIX -DASMV -DASM_CRC -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -DHAVE_FSEEKO"
+LFLAGS1="${LDFLAGS}"
+LFLAGS2=""
+OBJA="match.o crc_i386.o"
+EOF
 }
 
 src_compile() {
-	emake \
-		-f unix/Makefile \
-		CC="$(tc-getCC)" \
-		CPP="$(tc-getCC) -E" \
-		generic || die
+	emake -f unix/Makefile generic || die
 }
 
 src_install() {