diff --git a/lib/sde-build/flist_ns_tools.in b/lib/sde-build/flist_ns_tools.in
new file mode 100644
index 0000000..d0bd9a2
--- /dev/null
+++ b/lib/sde-build/flist_ns_tools.in
@@ -0,0 +1,34 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: lib/sde-build/flist_ns_tools.in
+# Copyright (C) 2020 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+FLNS_SRCDIR="src/tools-source/fl_ns"
+FLNS_RUN_SHORT="$toolsdir/bin/sde-run-ns"
+FLNS_MAKE_QUIET=yes
+
+flist_tools_clean() {
+	make ${FLNS_MAKE_QUIET:+-s} -C "$FLNS_SRCDIR" O="$TOOLSDIR" uninstall clean
+}
+
+flist_tools_build() {
+	echo_status "Building $FLNS_RUN_SHORT."
+	make ${FLNS_MAKE_QUIET:+-s} -C "$FLNS_SRCDIR" CC="$BUILDCC" O="$TOOLSDIR" tools || exit 1
+
+	echo_status "Testing $FLNS_RUN_SHORT."
+	if ! make ${FLNS_MAKE_QUIET:+-s} -C "$FLNS_SRCDIR" CC="$BUILDCC" O="$TOOLSDIR" test-tools; then
+		echo_error "Detected a problem with the $SDECFG_FLIST flist system"
+		echo_error "Please specify another flist-creation" \
+			   "system in your build configuration."
+		echo ; exit 1
+	fi
+}
diff --git a/lib/sde-config/main.in b/lib/sde-config/main.in
index 2ee1543..3493547 100644
--- a/lib/sde-config/main.in
+++ b/lib/sde-config/main.in
@@ -351,6 +351,7 @@ break packages!'
     block_begin 5
 	choice SDECFG_FLIST flwrapper \
 		flwrapper 'Use the flist wrapper library for flist creation' \
+		ns        'Use overlay filesystem for flist creation'        \
 		strace    'Use strace to get the file list'                  \
 		find      'Use find on timestamp-file for flist creation'
     block_end