diff --git a/config-root.toml b/config-root.toml
index defe48b..311d9eb 100644
--- a/config-root.toml
+++ b/config-root.toml
@@ -135,6 +135,10 @@ dst = "/etc/systemd/system.conf"
 src = "etc/default/cpupower"
 dst = "/etc/default/cpupower"
 
+[dotfiles."f_pacserve.service.conf"]
+src = "etc/pacserve/pacserve.service.conf"
+dst = "/etc/pacserve/pacserve.service.conf"
+
 [dotfiles."f_mkinitcpio_linux.preset"]
 src = "etc/mkinitcpio.d/linux.preset"
 dst = "/etc/mkinitcpio.d/linux.preset"
@@ -170,7 +174,12 @@ dotfiles = ["d_network", "f_networkd.conf"]
 dotfiles = ["f_locale.conf", "f_locale.gen"]
 
 [profiles.Pacman]
-dotfiles = ["f_pacman.conf", "f_pacman_zsh_hook", "f_sudoers_pacman"]
+dotfiles = [
+  "f_pacman.conf",
+  "f_pacman_zsh_hook",
+  "f_pacserve.service.conf",
+  "f_sudoers_pacman",
+]
 
 [profiles.Mirkwood]
 dotfiles = [
diff --git a/root/etc/pacman.conf b/root/etc/pacman.conf
index fe23a75..2e56746 100755
--- a/root/etc/pacman.conf
+++ b/root/etc/pacman.conf
@@ -14,18 +14,22 @@ CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
 {%@@ endif @@%}
 
 [core]
+Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
+Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [multilib]
+Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist
 
 [korhonen_aur]
 {%@@ if profile == "Moria" @@%}
 Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ else @@%}
+Include = /etc/pacman.d/pacserve
 Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch
 {%@@ endif @@%}
 
diff --git a/root/etc/pacserve/pacserve.service.conf b/root/etc/pacserve/pacserve.service.conf
new file mode 100755
index 0000000..a983b4c
--- /dev/null
+++ b/root/etc/pacserve/pacserve.service.conf
@@ -0,0 +1 @@
+PACSERVE_ARGS="--multicast --avahi"