diff --git a/salt/files/master.conf b/salt/files/master.conf
index 3475762..d8952e9 100644
--- a/salt/files/master.conf
+++ b/salt/files/master.conf
@@ -141,6 +141,7 @@
   {%- endif %}
 {%- endif %}
 
+{%- if pillar.salt.get('minion') %}
 {%- for handler in pillar.salt.minion.get("handlers", []) %}
 {%- if handler.engine == "udp"%}
 
@@ -156,6 +157,7 @@
   version: 1
 {%- endif %}
 {%- endfor %}
+{%- endif %}
 
 {%- if master.get('order_masters', False) %}
 
diff --git a/salt/map.jinja b/salt/map.jinja
index ab40acf..5bc540c 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -28,7 +28,7 @@
 {%- load_yaml as master_specific %}
 Arch:
   pkgs:
-  - salt-zmq
+  - salt
 Debian:
   pkgs:
   - salt-master
@@ -91,7 +91,7 @@
 {%- load_yaml as minion_specific %}
 Arch:
   pkgs:
-  - salt-zmq
+  - salt
 Debian:
   pkgs:
   - salt-minion