diff --git a/setup/install_postinstall b/setup/install_postinstall
new file mode 100755
index 0000000..6f5ac17
--- /dev/null
+++ b/setup/install_postinstall
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -uo pipefail
+
+# NetworkManager
+pacman -Q networkmanager &> /dev/null
+if [ $? = 0 ]; then
+  echo ":: Enabling NetworkManager"
+  systemctl enable NetworkManager.service
+fi
+
+# Cups
+pacman -Q cups &> /dev/null
+if [ $? = 0 ]; then
+  echo ":: Enabling CUPS"
+  systemctl enable org.cups.cupsd.service
+fi
+
+#Avahi
+pacman -Q avahi &> /dev/null
+if [ $? = 0 ]; then
+  systemctl disable systemd-resolved.service
+  cat /etc/nsswitch.conf | grep mdns_minimal &> /dev/null
+  if [ $? = 1 ]; then 
+    sed -i \
+      '/hosts/s/resolve \[\!UNAVAIL=return\] dns/mdns_minimal \[NOTFOUND\=return\] &/' \
+      /etc/nsswitch.conf
+  fi
+  systemctl enable avahi-daemon
+fi
+
diff --git a/setup/postinstall_packages b/setup/postinstall_packages
deleted file mode 100644
index 443087a..0000000
--- a/setup/postinstall_packages
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -uo pipefail
-
-# NetworkManager
-pacman -Q networkmanager &> /dev/null
-if [ $? = 1 ]; then
-  echo ":: Enabling networkmanager"
-  systemctl enable networkmanager
-fi