diff --git a/networkmanager/.footprint b/networkmanager/.footprint
index e3dfa760f..354244262 100644
--- a/networkmanager/.footprint
+++ b/networkmanager/.footprint
@@ -9,6 +9,10 @@ drwxr-xr-x	root/root	etc/NetworkManager/dispatcher.d/pre-up.d/
 drwxr-xr-x	root/root	etc/NetworkManager/dnsmasq-shared.d/
 drwxr-xr-x	root/root	etc/NetworkManager/dnsmasq.d/
 drwxr-xr-x	root/root	etc/NetworkManager/system-connections/
+drwxr-xr-x	root/root	etc/dbus-1/
+drwxr-xr-x	root/root	etc/dbus-1/system.d/
+-rw-r--r--	root/root	etc/dbus-1/system.d/nm-dispatcher.conf
+-rw-r--r--	root/root	etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/networkmanager
 drwxr-xr-x	root/root	lib/
@@ -20,11 +24,10 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/nm-online
 -rwxr-xr-x	root/root	usr/bin/nmcli
-drwxr-xr-x	root/root	usr/etc/
-drwxr-xr-x	root/root	usr/etc/dbus-1/
-drwxr-xr-x	root/root	usr/etc/dbus-1/system.d/
--rw-r--r--	root/root	usr/etc/dbus-1/system.d/nm-dispatcher.conf
--rw-r--r--	root/root	usr/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+-rwxr-xr-x	root/root	usr/bin/nmtui
+lrwxrwxrwx	root/root	usr/bin/nmtui-connect -> nmtui
+lrwxrwxrwx	root/root	usr/bin/nmtui-edit -> nmtui
+lrwxrwxrwx	root/root	usr/bin/nmtui-hostname -> nmtui
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/libnm/
 -rw-r--r--	root/root	usr/include/libnm/NetworkManager.h
@@ -183,7 +186,10 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/nm-online.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nmcli.1.gz
--rw-r--r--	root/root	usr/share/man/man1/nmtui.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/nmtui-connect.1
+-rw-r--r--	root/root	usr/share/man/man1/nmtui-edit.1
+-rw-r--r--	root/root	usr/share/man/man1/nmtui-hostname.1
+-rw-r--r--	root/root	usr/share/man/man1/nmtui.1
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/NetworkManager.conf.5
 -rw-r--r--	root/root	usr/share/man/man5/nm-settings-keyfile.5.gz
diff --git a/networkmanager/.signature b/networkmanager/.signature
index b247e154e..9f434a1f3 100644
--- a/networkmanager/.signature
+++ b/networkmanager/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF36QbMgXDymvRn5EWfVjxTf2FdzUvLo7dY5OOh1Nhq/l8uKRi1qeA1l7btveMeWrZVNs9WmBSM3sfxf6TelKUfgw=
-SHA256 (Pkgfile) = 54670e93b93e5fa70c3430108904ad6c4155fa3f0bbc698bd1eb7dbf6abe56c2
-SHA256 (.footprint) = 9b30f8e00f8080087f73487869bc3e9ff034669532eb7cb29f199d2387505cb9
+RWSagIOpLGJF314ZkbFZYyaqx7G4R6fiKOa9el1ldE4QtYLIPgUqiSDd5vazNODOxWO5EmEgSeDIXaPFUUDU55dYh/YsWM/NPQM=
+SHA256 (Pkgfile) = 4a92528f392f2ecd5b9d7776e7970e58decd8cfb8acd9d9206aa85fc66ecc77a
+SHA256 (.footprint) = e0cd5e8dae2f8337c638c3cac2ae428fed43648d470c42735521bedcca048cf6
 SHA256 (NetworkManager-1.8.0.tar.xz) = fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e
 SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc
 SHA256 (NetworkManager.conf) = b854c04d516f832d93416fd4150d30bb0188e1125c431fddbc6b8a84ba53f8d1
diff --git a/networkmanager/Pkgfile b/networkmanager/Pkgfile
index dcfadbc38..28fe6dbc9 100644
--- a/networkmanager/Pkgfile
+++ b/networkmanager/Pkgfile
@@ -6,7 +6,7 @@
 
 name=networkmanager
 version=1.8.0
-release=1
+release=2
 source=(
 http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${version%.*}/NetworkManager-${version}.tar.xz
 networkmanager.rc
@@ -48,8 +48,8 @@ build() {
 	make DESTDIR=$PKG install
 
 	# Fix the CRUX oddity
-	mkdir $PKG/usr/etc
-	mv $PKG/etc/dbus-1 $PKG/usr/etc
+	#mkdir $PKG/usr/etc
+	#mv $PKG/etc/dbus-1 $PKG/usr/etc
 
 	# Install config file
 	install -D -m 644 -o root -g root $SRC/NetworkManager.conf $PKG/etc/NetworkManager/NetworkManager.conf