diff --git a/config/rootfiles/packages/ncat b/config/rootfiles/common/ncat
similarity index 100%
rename from config/rootfiles/packages/ncat
rename to config/rootfiles/common/ncat
diff --git a/config/rootfiles/oldcore/189/filelists/ncat b/config/rootfiles/oldcore/189/filelists/ncat
new file mode 120000
index 000000000..38dcdb224
--- /dev/null
+++ b/config/rootfiles/oldcore/189/filelists/ncat
@@ -0,0 +1 @@
+../../../common/ncat
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/189/update.sh b/config/rootfiles/oldcore/189/update.sh
index cae569b80..e0436ebf4 100644
--- a/config/rootfiles/oldcore/189/update.sh
+++ b/config/rootfiles/oldcore/189/update.sh
@@ -324,6 +324,11 @@ rm -vrf \
 	/lib/firmware/qcom/vpu-1.0/venus.mdt \
 	/lib/firmware/RTL8192E
 
+# Remove the metadata for ncat (if installed) as this is now part of the core system
+rm -f "/opt/pakfire/db/installed/meta-ncat"
+rm -f "/opt/pakfire/db/meta/meta-ncat"
+rm -f "/opt/pakfire/db/rootfiles/ncat"
+
 # Stop services
 /usr/local/bin/openvpnctrl -k
 /usr/local/bin/openvpnctrl -kn2n
diff --git a/lfs/libvirt b/lfs/libvirt
index 4ac7dbf90..a497ed868 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -35,9 +35,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 aarch64
 PROG       = libvirt
-PAK_VER    = 35
+PAK_VER    = 36
 
-DEPS       = ebtables libpciaccess libyajl ncat qemu
+DEPS       = ebtables libpciaccess libyajl qemu
 
 SERVICES   = libvirtd virtlogd
 
diff --git a/lfs/ncat b/lfs/ncat
index e135b16ca..859647179 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -33,12 +33,6 @@ DL_FILE    = nmap-$(VER).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/nmap-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = ncat
-PAK_VER    = 12
-
-DEPS       =
-
-SERVICES   =
 
 ###############################################################################
 # Top-level Rules