diff --git a/315.lua.build b/315.lua.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/315.lua.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/315.ncurses.build b/315.ncurses.build
deleted file mode 120000
index 52bb82e..0000000
--- a/315.ncurses.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/316.ncurses.build b/316.ncurses.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/316.ncurses.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/316.ncursestw.build b/316.ncursestw.build
deleted file mode 120000
index 52bb82e..0000000
--- a/316.ncursestw.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/317.ncursestw.build b/317.ncursestw.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/317.ncursestw.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/317.ncursesw.build b/317.ncursesw.build
deleted file mode 120000
index 52bb82e..0000000
--- a/317.ncursesw.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/317.ncursesw.vars b/317.ncursesw.vars
deleted file mode 100644
index 50024de..0000000
--- a/317.ncursesw.vars
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# . ./build.vars and set -o errexit -o noglob are assumed.
-#
-
-pkg_ncursesw_install_post() {
-	for __ in 	\
-			bin/captoinfo bin/clear bin/infocmp bin/infotocap bin/ncursesw6-config	\
-			bin/reset bin/tabs bin/tic bin/toe bin/tput bin/tset			\
-			lib/libformw* lib/libmenuw* lib/libncursesw* lib/libpanelw*		\
-			share/man share/tabset share/terminfo; do
-		set +o noglob;
-		echo cp -pr ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*};
-		cp -pr ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*};
-		set -o noglob;
-	done;
-};
-
-# vim:filetype=sh
diff --git a/318.ncursesw.build b/318.ncursesw.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/318.ncursesw.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/318.ncursesw.vars b/318.ncursesw.vars
new file mode 100644
index 0000000..50024de
--- /dev/null
+++ b/318.ncursesw.vars
@@ -0,0 +1,18 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_ncursesw_install_post() {
+	for __ in 	\
+			bin/captoinfo bin/clear bin/infocmp bin/infotocap bin/ncursesw6-config	\
+			bin/reset bin/tabs bin/tic bin/toe bin/tput bin/tset			\
+			lib/libformw* lib/libmenuw* lib/libncursesw* lib/libpanelw*		\
+			share/man share/tabset share/terminfo; do
+		set +o noglob;
+		echo cp -pr ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*};
+		cp -pr ${PKG_PREFIX}/${__} ${PREFIX_MINIPIX}/${__%%/*};
+		set -o noglob;
+	done;
+};
+
+# vim:filetype=sh
diff --git a/318.npth.build b/318.npth.build
deleted file mode 120000
index 52bb82e..0000000
--- a/318.npth.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/319.npth.build b/319.npth.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/319.npth.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/319.xz.build b/319.xz.build
deleted file mode 120000
index 52bb82e..0000000
--- a/319.xz.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/320.xz.build b/320.xz.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/320.xz.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/424.lua.build b/424.lua.build
deleted file mode 120000
index 52bb82e..0000000
--- a/424.lua.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/424.lynx.build b/424.lynx.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/424.lynx.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/425.lynx.build b/425.lynx.build
deleted file mode 120000
index 52bb82e..0000000
--- a/425.lynx.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/425.man_db.build b/425.man_db.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/425.man_db.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/426.make.build b/426.make.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/426.make.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/426.man_db.build b/426.man_db.build
deleted file mode 120000
index 52bb82e..0000000
--- a/426.man_db.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/427.make.build b/427.make.build
deleted file mode 120000
index 52bb82e..0000000
--- a/427.make.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/427.mc.build b/427.mc.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/427.mc.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/428.mc.build b/428.mc.build
deleted file mode 120000
index 52bb82e..0000000
--- a/428.mc.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/428.mksh.build b/428.mksh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/428.mksh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/429.mksh.build b/429.mksh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/429.mksh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/429.nano.build b/429.nano.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/429.nano.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/430.nano.build b/430.nano.build
deleted file mode 120000
index 52bb82e..0000000
--- a/430.nano.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/430.netcat.build b/430.netcat.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/430.netcat.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/431.netcat.build b/431.netcat.build
deleted file mode 120000
index 52bb82e..0000000
--- a/431.netcat.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/431.openssh.build b/431.openssh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/431.openssh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/432.openssh.build b/432.openssh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/432.openssh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/432.pacman.build b/432.pacman.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/432.pacman.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/433.pacman.build b/433.pacman.build
deleted file mode 120000
index 52bb82e..0000000
--- a/433.pacman.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/433.patch.build b/433.patch.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/433.patch.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/434.patch.build b/434.patch.build
deleted file mode 120000
index 52bb82e..0000000
--- a/434.patch.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/434.perl.build b/434.perl.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/434.perl.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/434.perl.vars b/434.perl.vars
new file mode 100644
index 0000000..853bef9
--- /dev/null
+++ b/434.perl.vars
@@ -0,0 +1,24 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_perl_extract_post() {
+	git clone https://github.com/lalbornoz/perl-cross;
+	for _ppep_fname_src in $(find perl-cross -type f	\
+			-not -path perl-cross/.git/\* -not -name .gitignore); do
+		_ppep_fname_dst=perl-${PKG_VERSION}${_ppep_fname_src#perl-cross};
+		if [ -f ${_ppep_fname_dst} ]; then
+			mv -- ${_ppep_fname_dst} ${_ppep_fname_dst}.orig;
+		fi;
+		if [ ! -d "$(dirname ${_ppep_fname_dst})" ]; then
+			mkdir -p -- $(dirname ${_ppep_fname_dst});
+		fi;
+		cp -- ${_ppep_fname_src} ${_ppep_fname_dst};
+	done;
+	for _ppep_cflag in ${PKG_CFLAGS_CONFIGURE}; do
+		PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_ppep_cflag}";
+	done;
+	unset _ppep_fname_src _ppep_fname_dst _ppep_cflag;
+};
+
+# vim:filetype=sh
diff --git a/435.perl.build b/435.perl.build
deleted file mode 120000
index 52bb82e..0000000
--- a/435.perl.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/435.perl.vars b/435.perl.vars
deleted file mode 100644
index 853bef9..0000000
--- a/435.perl.vars
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# . ./build.vars and set -o errexit -o noglob are assumed.
-#
-
-pkg_perl_extract_post() {
-	git clone https://github.com/lalbornoz/perl-cross;
-	for _ppep_fname_src in $(find perl-cross -type f	\
-			-not -path perl-cross/.git/\* -not -name .gitignore); do
-		_ppep_fname_dst=perl-${PKG_VERSION}${_ppep_fname_src#perl-cross};
-		if [ -f ${_ppep_fname_dst} ]; then
-			mv -- ${_ppep_fname_dst} ${_ppep_fname_dst}.orig;
-		fi;
-		if [ ! -d "$(dirname ${_ppep_fname_dst})" ]; then
-			mkdir -p -- $(dirname ${_ppep_fname_dst});
-		fi;
-		cp -- ${_ppep_fname_src} ${_ppep_fname_dst};
-	done;
-	for _ppep_cflag in ${PKG_CFLAGS_CONFIGURE}; do
-		PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_ppep_cflag}";
-	done;
-	unset _ppep_fname_src _ppep_fname_dst _ppep_cflag;
-};
-
-# vim:filetype=sh
diff --git a/435.procps_ng.build b/435.procps_ng.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/435.procps_ng.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/436.procps_ng.build b/436.procps_ng.build
deleted file mode 120000
index 52bb82e..0000000
--- a/436.procps_ng.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/436.python3.build b/436.python3.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/436.python3.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/436.python3.vars b/436.python3.vars
new file mode 100644
index 0000000..9cdc016
--- /dev/null
+++ b/436.python3.vars
@@ -0,0 +1,17 @@
+#
+# . ./build.vars and set -o errexit -o noglob are assumed.
+#
+
+pkg_python3_configure_pre() {
+	(cd ../${PKG_SUBDIR} && autoconf);
+	(unset AR BLDSHARED CC CFLAGS CPPFLAGS LDFLAGS RANLIB;
+	mv -- config.cache ../${PKG_SUBDIR}/config.cache;
+	../${PKG_SUBDIR}/configure;
+	make	_FIP=Programs/host_freeze_importlib Programs/host_freeze_importlib	\
+		BUILDPYTHON=hostpython hostpython					\
+		PGEN=Parser/hostpgen Parser/hostpgen;
+	make distclean);
+	mv -- ../${PKG_SUBDIR}/config.cache .;
+};
+
+# vim:filetype=sh
diff --git a/437.python3.build b/437.python3.build
deleted file mode 120000
index 52bb82e..0000000
--- a/437.python3.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/437.python3.vars b/437.python3.vars
deleted file mode 100644
index 9cdc016..0000000
--- a/437.python3.vars
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# . ./build.vars and set -o errexit -o noglob are assumed.
-#
-
-pkg_python3_configure_pre() {
-	(cd ../${PKG_SUBDIR} && autoconf);
-	(unset AR BLDSHARED CC CFLAGS CPPFLAGS LDFLAGS RANLIB;
-	mv -- config.cache ../${PKG_SUBDIR}/config.cache;
-	../${PKG_SUBDIR}/configure;
-	make	_FIP=Programs/host_freeze_importlib Programs/host_freeze_importlib	\
-		BUILDPYTHON=hostpython hostpython					\
-		PGEN=Parser/hostpgen Parser/hostpgen;
-	make distclean);
-	mv -- ../${PKG_SUBDIR}/config.cache .;
-};
-
-# vim:filetype=sh
diff --git a/437.rsync.build b/437.rsync.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/437.rsync.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/438.rsync.build b/438.rsync.build
deleted file mode 120000
index 52bb82e..0000000
--- a/438.rsync.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/438.rxvt_unicode.build b/438.rxvt_unicode.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/438.rxvt_unicode.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/439.rxvt_unicode.build b/439.rxvt_unicode.build
deleted file mode 120000
index 52bb82e..0000000
--- a/439.rxvt_unicode.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/439.sed.build b/439.sed.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/439.sed.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/440.sed.build b/440.sed.build
deleted file mode 120000
index 52bb82e..0000000
--- a/440.sed.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/440.tar.build b/440.tar.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/440.tar.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/441.tar.build b/441.tar.build
deleted file mode 120000
index 52bb82e..0000000
--- a/441.tar.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/441.tcsh.build b/441.tcsh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/441.tcsh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/442.tcsh.build b/442.tcsh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/442.tcsh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/442.the_silver_searcher.build b/442.the_silver_searcher.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/442.the_silver_searcher.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/443.the_silver_searcher.build b/443.the_silver_searcher.build
deleted file mode 120000
index 52bb82e..0000000
--- a/443.the_silver_searcher.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/443.tmux.build b/443.tmux.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/443.tmux.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/444.tmux.build b/444.tmux.build
deleted file mode 120000
index 52bb82e..0000000
--- a/444.tmux.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/444.util_linux.build b/444.util_linux.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/444.util_linux.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/445.util_linux.build b/445.util_linux.build
deleted file mode 120000
index 52bb82e..0000000
--- a/445.util_linux.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/445.vim.build b/445.vim.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/445.vim.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/446.vim.build b/446.vim.build
deleted file mode 120000
index 52bb82e..0000000
--- a/446.vim.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/446.weechat.build b/446.weechat.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/446.weechat.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/build.vars b/build.vars
index 034b754..69ca7df 100644
--- a/build.vars
+++ b/build.vars
@@ -254,7 +254,7 @@ PKG_LVL4_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_LIBFFI_CONFIGURE_ARGS_EXTRA:=--program-prefix=};
 : ${PKG_LIBGCRYPT_VERSION:=1.7.3};
 : ${PKG_LIBGCRYPT_SHA256SUM:=ddac6111077d0a1612247587be238c5294dd0ee4d76dc7ba783cc55fb0337071};
-: ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.3.tar.bz2};
+: ${PKG_LIBGCRYPT_URL:=https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${PKG_LIBGCRYPT_VERSION}.tar.bz2};
 : ${PKG_LIBGCRYPT_CONFIGURE_ARGS_EXTRA:=--disable-asm --disable-padlock-support --disable-aesni-support --disable-pclmul-support --disable-sse41-support --disable-drng-support --disable-avx-support --disable-avx2-support gcry_cv_gcc_inline_asm_avx2=no gcry_cv_gcc_inline_asm_avx=no gcry_cv_gcc_inline_asm_bmi2=no gcry_cv_gcc_inline_asm_pclmul=no gcry_cv_gcc_inline_asm_sse41=no gcry_cv_gcc_inline_asm_ssse3=no --disable-amd64-as-feature-detection};
 : ${PKG_LIBGPG_ERROR_VERSION:=1.24};
 : ${PKG_LIBGPG_ERROR_SHA256SUM:=9268e1cc487de5e6e4460fca612a06e4f383072ac43ae90603e5e46783d3e540};
@@ -296,7 +296,7 @@ PKG_LVL4_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --program-prefix= --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
 : ${PKG_NPTH_VERSION:=1.2};
-: ${PKH_NPTH_SHA256SUM:=6ddbdddb2cf49a4723f9d1ad6563c480d6760dcb63cb7726b8fc3bc2e1b6c08a};
+: ${PKG_NPTH_SHA256SUM:=6ddbdddb2cf49a4723f9d1ad6563c480d6760dcb63cb7726b8fc3bc2e1b6c08a};
 : ${PKG_NPTH_URL:=https://www.gnupg.org/ftp/gcrypt/npth/npth-${PKG_NPTH_VERSION}.tar.bz2};
 : ${PKG_PCRE_VERSION:=8.39};
 : ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
@@ -615,6 +615,12 @@ fi;
 : ${PKG_VIM_CONFIGURE_ARGS_EXTRA:=--with-tlib=ncursesw};
 : ${PKG_VIM_INSTALL_FILES:=@vim=bin/vi};
 : ${PKG_VIM_MAKEFLAGS_INSTALL_EXTRA:=STRIP=/bin/true};
+: ${PKG_WEECHAT_VERSION:=1.6};
+: ${PKG_WEECHAT_URL:=https://weechat.org/files/src/weechat-${PKG_WEECHAT_VERSION}.tar.gz};
+: ${PKG_WEECHAT_SHA256SUM:=3061e57460e0e3e4533551c45ced53b222fe0933848250d0fb7337d9aacfd853};
+: ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-python --disable-python3"};
+: ${PKG_WEECHAT_ENV_VARS_EXTRA:=CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config};
+: ${PKG_WEECHAT_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_WHICH_VERSION:=2.21};
 : ${PKG_WHICH_SHA256SUM:=f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad};
 : ${PKG_WHICH_URL:=https://ftp.gnu.org/gnu/which/which-${PKG_WHICH_VERSION}.tar.gz};
diff --git a/weechat-1.6.local.patch b/weechat-1.6.local.patch
new file mode 100644
index 0000000..7f64246
--- /dev/null
+++ b/weechat-1.6.local.patch
@@ -0,0 +1,24 @@
+diff -ru weechat-1.6.orig/config.sub weechat-1.6/config.sub
+--- weechat-1.6.orig/config.sub	2016-10-19 20:51:03.610252372 +0200
++++ weechat-1.6/config.sub	2016-10-19 20:33:14.686252372 +0200
+@@ -1376,7 +1376,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
++	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+ 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+diff -ru weechat-1.6.orig/configure weechat-1.6/configure
+--- weechat-1.6.orig/configure	2016-10-19 20:51:02.366252372 +0200
++++ weechat-1.6/configure	2016-10-19 20:46:26.802252372 +0200
+@@ -23683,7 +23683,7 @@
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+     GCRYPT_CFLAGS=`libgcrypt-config --cflags`
+-    GCRYPT_LFLAGS=`libgcrypt-config --libs`
++    GCRYPT_LFLAGS="-lgcrypt -lgpg-error"
+ 
+ 
+ fi