diff --git a/files/libvirt-bin b/files/libvirt-bin
new file mode 100644
index 0000000..b9ec04c
--- /dev/null
+++ b/files/libvirt-bin
@@ -0,0 +1,11 @@
+# Defaults for libvirt-bin initscript (/etc/init.d/libvirt-bin)
+# This is a POSIX shell fragment
+
+# Start libvirtd to handle qemu/kvm:
+start_libvirtd="yes"
+
+# options passed to libvirtd, add "-l" to listen on tcp
+libvirtd_opts="-d -l"
+
+# pass in location of kerberos keytab
+#export KRB5_KTNAME=/etc/libvirt/libvirt.keytab
\ No newline at end of file
diff --git a/files/libvirtd.conf.Debian b/files/libvirtd.conf.Debian
index a73f9df..25814b1 100644
--- a/files/libvirtd.conf.Debian
+++ b/files/libvirtd.conf.Debian
@@ -32,6 +32,9 @@
 # This is disabled by default, uncomment this to enable it.
 #listen_tcp = 1
 
+listen_tls = 0
+listen_tcp = 1
+auth_tcp="none"
 
 
 # Override the port for accepting secure TLS connections
diff --git a/server.sls b/server.sls
index 66b3e21..ec2270a 100644
--- a/server.sls
+++ b/server.sls
@@ -14,13 +14,28 @@
   - require:
     - pkg: libvirt_packages
 
+{%- if grains.os_family == 'RedHat' %}
+
 libvirt_sysconfig:
-  file.append:
-  - name: {{ server.config_sys }}
-  - text: 'LIBVIRTD_ARGS="--listen"'
+  file.managed:
+  - name: /etc/sysconfig/libvirtd
+  - contents: 'LIBVIRTD_ARGS="--listen"'
   - require:
     - pkg: libvirt_packages
 
+{%- endif %}
+
+{%- if grains.os_family == 'Debian' %}
+
+/etc/default/libvirt-bin:
+  file.managed:
+  - source: salt://libvirt/files/libvirt-bin
+  - contents: 'LIBVIRTD_ARGS="--listen"'
+  - require:
+    - pkg: libvirt_packages
+
+{%- endif %}
+
 libvirt_service:
   service.running:
   - name: {{ server.service }}