diff --git a/patches/infounzip.local.patch b/patches/infounzip.local.patch
new file mode 100644
index 0000000..f8d3c1c
--- /dev/null
+++ b/patches/infounzip.local.patch
@@ -0,0 +1,24 @@
+--- infounzip/Makefile.dist	2019-04-26 18:39:08.660000000 +0000
++++ infounzip/Makefile	2019-06-16 16:37:56.980000000 +0000
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = cp
+ INSTALL_D = mkdir -p
+ 
+-CFLAGS ?= -I. -DUNIX -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS
++override CFLAGS += -I. -DUNIX -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUNICODE_SUPPORT -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DHAVE_DIRENT_H -DHAVE_TERMIOS_H -D_MBCS
+ LFLAGS1 ?=
+ LDFLAGS ?=
+ 
+@@ -38,10 +38,10 @@
+ $(OBJF): $(UNZIP_H)
+ 
+ unzip: $(OBJU)
+-	$(CC) -o unzip $(LFLAGS1) $(OBJU) $(LDFLAGS)
++	$(CC) -o unzip $(LFLAGS1) $(LDFLAGS) $(OBJU)
+ 
+ funzip: $(OBJF)
+-	$(CC) -o funzip $(LFLAGS1) $(OBJF) $(LDFLAGS)
++	$(CC) -o funzip $(LFLAGS1) $(LDFLAGS) $(OBJF)
+ 
+ UNZIPS = unzip funzip
+ 
diff --git a/patches/infounzip_minipix.local.patch b/patches/infounzip_minipix.local.patch
deleted file mode 100644
index 68a9fa7..0000000
--- a/patches/infounzip_minipix.local.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- infounzip/Makefile.orig	2018-05-14 22:16:49.060000000 +0000
-+++ infounzip/Makefile	2018-06-06 09:34:33.224000000 +0000
-@@ -38,10 +38,10 @@
- $(OBJF): $(UNZIP_H)
- 
- unzip: $(OBJU)
--	$(CC) -o unzip $(LFLAGS1) $(OBJU) $(LDFLAGS)
-+	$(CC) -o unzip $(LFLAGS1) $(LDFLAGS) $(OBJU) $(LDFLAGS)
- 
- funzip: $(OBJF)
--	$(CC) -o funzip $(LFLAGS1) $(OBJF) $(LDFLAGS)
-+	$(CC) -o funzip $(LFLAGS1) $(LDFLAGS) $(OBJF) $(LDFLAGS)
- 
- UNZIPS = unzip funzip
- 
diff --git a/patches/infounzip_minipix.local.patch b/patches/infounzip_minipix.local.patch
new file mode 120000
index 0000000..08f8112
--- /dev/null
+++ b/patches/infounzip_minipix.local.patch
@@ -0,0 +1 @@
+infounzip.local.patch
\ No newline at end of file
diff --git a/patches/infozip.local.patch b/patches/infozip.local.patch
new file mode 100644
index 0000000..4af7683
--- /dev/null
+++ b/patches/infozip.local.patch
@@ -0,0 +1,32 @@
+--- infozip/Makefile.dist	2019-04-26 18:39:23.212000000 +0000
++++ infozip/Makefile	2019-06-16 16:39:03.728000000 +0000
+@@ -10,7 +10,7 @@
+ INSTALL_PROGRAM = cp
+ INSTALL_D = mkdir -p
+ 
+-CFLAGS ?= -I. -DUNIX -DHAVE_TERMIOS_H -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DHAVE_DIRENT_H -DUIDGID_NOT_16BIT
++override CFLAGS += -I. -DUNIX -DHAVE_TERMIOS_H -DNO_BZIP2_SUPPORT -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT -DHAVE_DIRENT_H -DUIDGID_NOT_16BIT
+ LFLAGS1 ?=
+ LDFLAGS ?=
+ 
+@@ -45,16 +45,16 @@
+ $(OBJC): $(ZIP_H)
+ 
+ zip: $(OBJZ) $(OBJI)
+-	$(CC) -o zip $(LFLAGS1) $(OBJZ) $(OBJI) $(LDFLAGS)
++	$(CC) -o zip $(LFLAGS1) $(LDFLAGS) $(OBJZ) $(OBJI)
+ 
+ zipnote: $(OBJN)
+-	$(CC) -o zipnote $(LFLAGS1) $(OBJN) $(LDFLAGS)
++	$(CC) -o zipnote $(LFLAGS1) $(LDFLAGS) $(OBJN)
+ 
+ zipcloak: $(OBJC)
+-	$(CC) -o zipcloak $(LFLAGS1) $(OBJC) $(LDFLAGS)
++	$(CC) -o zipcloak $(LFLAGS1) $(LDFLAGS) $(OBJC)
+ 
+ zipsplit: $(OBJS)
+-	$(CC) -o zipsplit $(LFLAGS1) $(OBJS) $(LDFLAGS)
++	$(CC) -o zipsplit $(LFLAGS1) $(LDFLAGS) $(OBJS)
+ 
+ ZIPS = zip zipcloak zipnote zipsplit
+ 
diff --git a/patches/infozip_minipix.local.patch b/patches/infozip_minipix.local.patch
deleted file mode 100644
index d5db79d..0000000
--- a/patches/infozip_minipix.local.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- infozip/Makefile.orig	2018-05-14 22:16:50.436000000 +0000
-+++ infozip/Makefile	2018-06-06 09:34:02.456000000 +0000
-@@ -45,16 +45,16 @@
- $(OBJC): $(ZIP_H)
- 
- zip: $(OBJZ) $(OBJI)
--	$(CC) -o zip $(LFLAGS1) $(OBJZ) $(OBJI) $(LDFLAGS)
-+	$(CC) -o zip $(LFLAGS1) $(LDFLAGS) $(OBJZ) $(OBJI) $(LDFLAGS)
- 
- zipnote: $(OBJN)
--	$(CC) -o zipnote $(LFLAGS1) $(OBJN) $(LDFLAGS)
-+	$(CC) -o zipnote $(LFLAGS1) $(LDFLAGS) $(OBJN) $(LDFLAGS)
- 
- zipcloak: $(OBJC)
--	$(CC) -o zipcloak $(LFLAGS1) $(OBJC) $(LDFLAGS)
-+	$(CC) -o zipcloak $(LFLAGS1) $(LDFLAGS) $(OBJC) $(LDFLAGS)
- 
- zipsplit: $(OBJS)
--	$(CC) -o zipsplit $(LFLAGS1) $(OBJS) $(LDFLAGS)
-+	$(CC) -o zipsplit $(LFLAGS1) $(LDFLAGS) $(OBJS) $(LDFLAGS)
- 
- ZIPS = zip zipcloak zipnote zipsplit
- 
diff --git a/patches/infozip_minipix.local.patch b/patches/infozip_minipix.local.patch
new file mode 120000
index 0000000..25a5bcd
--- /dev/null
+++ b/patches/infozip_minipix.local.patch
@@ -0,0 +1 @@
+infozip.local.patch
\ No newline at end of file
diff --git a/vars/build.vars b/vars/build.vars
index ae9c5f7..297424f 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1012,6 +1012,17 @@ DEV_PACKAGES_PREFIX="${NATIVE_PACKAGES_DEPS_PREFIX}";
 DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 
 #
+# Build target native_packages
+#
+NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
+NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_PARALLELISE=1;
+NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
+NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
+
+#
 # Packages list native_packages_cmdline
 NATIVE_PACKAGES_CMDLINE_PACKAGES="
 bash bc busybox calcurse coreutils dash datamash dos2unix ed figlet findutils
@@ -1333,8 +1344,10 @@ tmux tzdb vim yabasic xcowsay xeyes xorriso xterm xwd";
 : ${PKG_ISYNC_CONFIGURE_ARGS_EXTRA:=--disable-compat};
 : ${PKG_INFOUNZIP_URLS_GIT:=infounzip=https://github.com/Redfoxmoon3/infounzip.git@master};
 : ${PKG_INFOUNZIP_IN_TREE:=1};
+: ${PKG_INFOUNZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_INFOZIP_URLS_GIT:=infozip=https://github.com/Redfoxmoon3/infozip.git@master};
 : ${PKG_INFOZIP_IN_TREE:=1};
+: ${PKG_INFOZIP_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_JAMVM_SHA256SUM:=76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da};
 : ${PKG_JAMVM_VERSION:=2.0.0};
 : ${PKG_JAMVM_URL:=http://sourceforge.mirrorservice.org/j/ja/jamvm/jamvm/JamVM%20${PKG_JAMVM_VERSION}/jamvm-${PKG_JAMVM_VERSION}.tar.gz};
@@ -1596,21 +1609,11 @@ mailutils mtr mutt microsocks nginx openlitespeed openssh pacman rsync socat tht
 : ${PKG_WHOIS_MAKE_INSTALL_VNAME:=BASEDIR};
 : ${PKG_WHOIS_SUBDIR:=whois-${PKG_WHOIS_VERSION}};
 
-#
-# Build target native_packages
-#
-NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_PACKAGES="
 ${NATIVE_PACKAGES_CMDLINE_PACKAGES}
 ${NATIVE_PACKAGES_DEV_PACKAGES}
 ${NATIVE_PACKAGES_ETC_PACKAGES}
 ${NATIVE_PACKAGES_INET_PACKAGES}";
-NATIVE_PACKAGES_PARALLELISE=1;
-NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
-NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 
 #
 # Build target minipix