diff --git a/334.htop.build b/334.htop.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/334.htop.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/334.inetutils.build b/334.inetutils.build
deleted file mode 120000
index 52bb82e..0000000
--- a/334.inetutils.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/335.inetutils.build b/335.inetutils.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/335.inetutils.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/335.irssi.build b/335.irssi.build
deleted file mode 120000
index 52bb82e..0000000
--- a/335.irssi.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/336.irssi.build b/336.irssi.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/336.irssi.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/336.less.build b/336.less.build
deleted file mode 120000
index 52bb82e..0000000
--- a/336.less.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/337.less.build b/337.less.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/337.less.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/337.lua.build b/337.lua.build
deleted file mode 120000
index 52bb82e..0000000
--- a/337.lua.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/338.lua.build b/338.lua.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/338.lua.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/338.lynx.build b/338.lynx.build
deleted file mode 120000
index 52bb82e..0000000
--- a/338.lynx.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/339.lynx.build b/339.lynx.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/339.lynx.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/339.man_db.build b/339.man_db.build
deleted file mode 120000
index 52bb82e..0000000
--- a/339.man_db.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/340.make.build b/340.make.build
deleted file mode 120000
index 52bb82e..0000000
--- a/340.make.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/340.man_db.build b/340.man_db.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/340.man_db.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/341.make.build b/341.make.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/341.make.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/341.mc.build b/341.mc.build
deleted file mode 120000
index 52bb82e..0000000
--- a/341.mc.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/342.mc.build b/342.mc.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/342.mc.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/342.mksh.build b/342.mksh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/342.mksh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/343.mksh.build b/343.mksh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/343.mksh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/343.nano.build b/343.nano.build
deleted file mode 120000
index 52bb82e..0000000
--- a/343.nano.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/344.nano.build b/344.nano.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/344.nano.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/344.netcat.build b/344.netcat.build
deleted file mode 120000
index 52bb82e..0000000
--- a/344.netcat.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/345.netcat.build b/345.netcat.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/345.netcat.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/345.openssh.build b/345.openssh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/345.openssh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/346.openssh.build b/346.openssh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/346.openssh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/346.pacman.build b/346.pacman.build
deleted file mode 120000
index 52bb82e..0000000
--- a/346.pacman.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/347.pacman.build b/347.pacman.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/347.pacman.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/347.patch.build b/347.patch.build
deleted file mode 120000
index 52bb82e..0000000
--- a/347.patch.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/348.patch.build b/348.patch.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/348.patch.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/348.perl.build b/348.perl.build
deleted file mode 120000
index 52bb82e..0000000
--- a/348.perl.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/348.perl.vars b/348.perl.vars
deleted file mode 100644
index 853bef9..0000000
--- a/348.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/349.perl.build b/349.perl.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/349.perl.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/349.perl.vars b/349.perl.vars
new file mode 100644
index 0000000..853bef9
--- /dev/null
+++ b/349.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/349.procps_ng.build b/349.procps_ng.build
deleted file mode 120000
index 52bb82e..0000000
--- a/349.procps_ng.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/350.procps_ng.build b/350.procps_ng.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/350.procps_ng.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/350.python3.build b/350.python3.build
deleted file mode 120000
index 52bb82e..0000000
--- a/350.python3.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/350.python3.vars b/350.python3.vars
deleted file mode 100644
index 9cdc016..0000000
--- a/350.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/351.python3.build b/351.python3.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/351.python3.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/351.python3.vars b/351.python3.vars
new file mode 100644
index 0000000..9cdc016
--- /dev/null
+++ b/351.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/351.rsync.build b/351.rsync.build
deleted file mode 120000
index 52bb82e..0000000
--- a/351.rsync.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/352.rsync.build b/352.rsync.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/352.rsync.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/352.sed.build b/352.sed.build
deleted file mode 120000
index 52bb82e..0000000
--- a/352.sed.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/353.sed.build b/353.sed.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/353.sed.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/353.tar.build b/353.tar.build
deleted file mode 120000
index 52bb82e..0000000
--- a/353.tar.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/354.tar.build b/354.tar.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/354.tar.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/354.tcsh.build b/354.tcsh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/354.tcsh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/355.tcsh.build b/355.tcsh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/355.tcsh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/355.the_silver_searcher.build b/355.the_silver_searcher.build
deleted file mode 120000
index 52bb82e..0000000
--- a/355.the_silver_searcher.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/356.the_silver_searcher.build b/356.the_silver_searcher.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/356.the_silver_searcher.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/356.tmux.build b/356.tmux.build
deleted file mode 120000
index 52bb82e..0000000
--- a/356.tmux.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/357.tmux.build b/357.tmux.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/357.tmux.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/357.util_linux.build b/357.util_linux.build
deleted file mode 120000
index 52bb82e..0000000
--- a/357.util_linux.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/358.util_linux.build b/358.util_linux.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/358.util_linux.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/358.vim.build b/358.vim.build
deleted file mode 120000
index 52bb82e..0000000
--- a/358.vim.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/359.vim.build b/359.vim.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/359.vim.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/359.which.build b/359.which.build
deleted file mode 120000
index 52bb82e..0000000
--- a/359.which.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/360.which.build b/360.which.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/360.which.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/360.whois.build b/360.whois.build
deleted file mode 120000
index 52bb82e..0000000
--- a/360.whois.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/361.whois.build b/361.whois.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/361.whois.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/361.zsh.build b/361.zsh.build
deleted file mode 120000
index 52bb82e..0000000
--- a/361.zsh.build
+++ /dev/null
@@ -1 +0,0 @@
-pkg.build
\ No newline at end of file
diff --git a/362.zsh.build b/362.zsh.build
new file mode 120000
index 0000000..52bb82e
--- /dev/null
+++ b/362.zsh.build
@@ -0,0 +1 @@
+pkg.build
\ No newline at end of file
diff --git a/build.vars b/build.vars
index 635b811..a76f00c 100644
--- a/build.vars
+++ b/build.vars
@@ -309,6 +309,9 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw};
 : ${PKG_HEXCURSE_URL:=https://github.com/LonnyGomes/hexcurse};
 : ${PKG_HEXCURSE_URL_TYPE:=git};
+: ${PKG_HTOP_VERSION:=2.0.1};
+: ${PKG_HTOP_SHA256SUM:=f410626dfaf6b70fdf73cd7bb33cae768869707028d847fed94a978e974f5666};
+: ${PKG_HTOP_URL:=http://hisham.hm/htop/releases/${PKG_HTOP_VERSION}/htop-${PKG_HTOP_VERSION}.tar.gz};
 : ${PKG_INETUTILS_VERSION=1.9.4};
 : ${PKG_INETUTILS_SHA256SUM:=849d96f136effdef69548a940e3e0ec0624fc0c81265296987986a0dd36ded37};
 : ${PKG_INETUTILS_URL:=https://ftp.gnu.org/gnu/inetutils/inetutils-${PKG_INETUTILS_VERSION}.tar.xz};
diff --git a/htop-2.0.1.local.patch b/htop-2.0.1.local.patch
new file mode 100644
index 0000000..1799722
--- /dev/null
+++ b/htop-2.0.1.local.patch
@@ -0,0 +1,11 @@
+--- htop-2.0.1/configure.orig	2016-03-07 21:12:35.000000000 +0000
++++ htop-2.0.1/configure	2016-07-10 14:39:42.654635796 +0000
+@@ -13313,7 +13313,7 @@
+    fi
+    if test "x$htop_script_success" = xno; then
+ 
+-   htop_config_script=$("ncursesw5-config" --libs 2> /dev/null)
++   htop_config_script=$("${PKG_PREFIX}/bin/ncursesw6-config" --libs 2> /dev/null)
+    htop_script_success=no
+    htop_save_LDFLAGS="$LDFLAGS"
+    if test ! "x$htop_config_script" = x; then