diff --git a/make/target-tools.mk b/make/target-tools.mk
index 2bdd59ee..eedc4f6a 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -508,8 +508,15 @@ $(DL_DIR)/$(NANO_SOURCE):
 
 NANO_DEPENDENCIES = ncurses
 
-NANO_CONF_ENV = \
+ifeq ($(BS_PACKAGE_NCURSES_WCHAR),y)
+  NANO_CONF_ENV = \
+	ac_cv_prog_NCURSESW_CONFIG=$(HOST_DIR)/bin/$(NCURSES_CONFIG_SCRIPTS)
+else
+  NANO_CONF_ENV = \
 	ac_cv_prog_NCURSESW_CONFIG=false
+  NANO_MAKE_ENV = \
+	CURSES_LIB="-lncurses"
+endif
 
 NANO_CONF_OPTS = \
 	--datarootdir=$(REMOVE_datarootdir) \
@@ -524,7 +531,7 @@ nano: $(NANO_DEPENDENCIES) $(DL_DIR)/$(NANO_SOURCE) | $(TARGET_DIR)
 	$(UNTAR)/$(PKG_SOURCE)
 	$(CHDIR)/$(PKG_DIR); \
 		$(CONFIGURE); \
-		$(MAKE) CURSES_LIB="-lncurses"; \
+		$(NANO_MAKE_ENV) $(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	$(INSTALL) -d $(TARGET_sysconfdir)/profile.d
 	echo "export EDITOR=nano" > $(TARGET_sysconfdir)/profile.d/editor.sh
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 13346bc4..dae51fad 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -9,7 +9,11 @@ NCURSES_DIR = ncurses-$(NCURSES_VERSION)
 NCURSES_SOURCE = ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_SITE = $(GNU_MIRROR)/ncurses
 
-NCURSES_CONFIG_SCRIPTS = ncurses6-config
+ifeq ($(BS_PACKAGE_NCURSES_WCHAR),y)
+NCURSES_LIB_SUFFIX = w
+endif
+
+NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config
 
 NCURSES_CONF_OPTS = \
 	--enable-pc-files \
@@ -30,10 +34,43 @@ NCURSES_CONF_OPTS = \
 	--without-profile \
 	--without-cxx-binding
 
+ifeq ($(NCURSES_LIB_SUFFIX),w)
+
+NCURSES_CONF_OPTS += --enable-widec
+NCURSES_CONF_OPTS += --enable-ext-colors
+
+NCURSES_LIBS = ncurses menu panel form
+
+define NCURSES_LINK_LIBS_STATIC
+	$(foreach lib,$(NCURSES_LIBS:%=lib%), \
+		ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(TARGET_libdir)/$(lib).a
+	)
+	ln -sf libncurses$(NCURSES_LIB_SUFFIX).a $(TARGET_libdir)/libcurses.a
+endef
+
+define NCURSES_LINK_LIBS_SHARED
+	$(foreach lib,$(NCURSES_LIBS:%=lib%), \
+		ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(TARGET_libdir)/$(lib).so
+	)
+	ln -sf libncurses$(NCURSES_LIB_SUFFIX).so $(TARGET_libdir)/libcurses.so
+endef
+
+define NCURSES_LINK_PC
+	$(foreach pc,$(NCURSES_LIBS), \
+		ln -sf $(pc)$(NCURSES_LIB_SUFFIX).pc $(TARGET_libdir)/pkgconfig/$(pc).pc
+	)
+endef
+
+NCURSES_TARGET_FINALIZE_HOOKS += NCURSES_LINK_LIBS_STATIC
+NCURSES_TARGET_FINALIZE_HOOKS += NCURSES_LINK_LIBS_SHARED
+NCURSES_TARGET_FINALIZE_HOOKS += NCURSES_LINK_PC
+
+endif # NCURSES_LIB_SUFFIX
+
 define NCURSES_TARGET_CLEANUP
 	$(TARGET_RM) $(addprefix $(TARGET_bindir)/,captoinfo clear infocmp infotocap reset tabs tic toe)
 	$(TARGET_RM) $(addprefix $(TARGET_libdir)/,libform* libmenu* libpanel*)
-	$(TARGET_RM) $(addprefix $(TARGET_libdir)/pkgconfig/,form.pc menu.pc panel.pc)
+	$(TARGET_RM) $(addprefix $(TARGET_libdir)/pkgconfig/,form*.pc menu*.pc panel*.pc)
 endef
 NCURSES_TARGET_FINALIZE_HOOKS += NCURSES_TARGET_CLEANUP
 
diff --git a/package/ncurses/patches/ncurses-gcc-5.x-MKlib_gen.patch b/package/ncurses/patches/0001-gcc-5.x-MKlib_gen.patch
similarity index 92%
rename from package/ncurses/patches/ncurses-gcc-5.x-MKlib_gen.patch
rename to package/ncurses/patches/0001-gcc-5.x-MKlib_gen.patch
index df7c15fe..0106e807 100644
--- a/package/ncurses/patches/ncurses-gcc-5.x-MKlib_gen.patch
+++ b/package/ncurses/patches/0001-gcc-5.x-MKlib_gen.patch
@@ -11,10 +11,11 @@ http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39b
 
 Original author: Thomas E. Dickey <dickey@invisible-island.net>
 Signed-off-by: Mikhail Peselnik <bas@bmail.ru>
-
+[Adam Duskett: Refresh for 6.1]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
 --- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400
 +++ b/ncurses/base/MKlib_gen.sh	2017-02-07 10:09:01.293962392 -0500
-@@ -491,11 +491,22 @@
+@@ -505,11 +505,22 @@
  	-e 's/gen_$//' \
  	-e 's/  / /g' >>$TMP
  
diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk
index 09411d89..efd0fbe8 100644
--- a/package/procps-ng/procps-ng.mk
+++ b/package/procps-ng/procps-ng.mk
@@ -26,6 +26,12 @@ PROCPS_NG_CONF_OPTS = \
 	--docdir=$(REMOVE_docdir) \
 	--without-systemd
 
+# Allows unicode characters to show in 'watch'
+ifeq ($(BS_PACKAGE_NCURSES_WCHAR),y)
+  PROCPS_NG_CONF_OPTS += \
+	--enable-watch8bit
+endif
+
 PROCPS_NG_BINARIES = ps top
 
 define PROCPS_NG_INSTALL_BINARIES
diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk
index adf6586b..cc07ea81 100644
--- a/package/util-linux/util-linux.mk
+++ b/package/util-linux/util-linux.mk
@@ -104,7 +104,6 @@ UTIL_LINUX_CONF_OPTS = \
 	--without-audit \
 	--without-cap-ng \
 	--without-btrfs \
-	--without-ncursesw \
 	--without-python \
 	--without-readline \
 	--without-slang \
@@ -116,5 +115,19 @@ UTIL_LINUX_CONF_OPTS = \
 	--without-udev \
 	--without-utempter
 
+ifeq ($(BS_PACKAGE_NCURSES_WCHAR),y)
+  UTIL_LINUX_CONF_ENV += \
+	NCURSESW6_CONFIG=$(HOST_DIR)/bin/$(NCURSES_CONFIG_SCRIPTS)
+  UTIL_LINUX_CONF_OPTS += \
+	--with-ncursesw
+else
+  UTIL_LINUX_CONF_ENV += \
+	NCURSES6_CONFIG=$(HOST_DIR)/bin/$(NCURSES_CONFIG_SCRIPTS)
+  UTIL_LINUX_CONF_OPTS += \
+	--without-ncursesw \
+	--with-ncurses \
+	--disable-widechar
+endif
+
 util-linux: | $(TARGET_DIR)
 	$(call autotools-package)