diff --git a/aptcacher/files/apt-cacher-ng-default b/aptcacher/files/apt-cacher-ng-default
new file mode 100644
index 0000000..c2c4bc0
--- /dev/null
+++ b/aptcacher/files/apt-cacher-ng-default
@@ -0,0 +1,20 @@
+# Defaults for apt-cacher-ng initscript
+# sourced by /etc/init.d/apt-cacher-ng
+# installed at /etc/default/apt-cacher-ng by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Set to non-empty value to disable the start of the service at boot time
+# DISABLED=1
+
+# See umask(2) or chmod(1) for details.
+# 002 would make new files writable by group.
+#
+# umask 022
+
+# Additional options that are passed to the Daemon.
+
+limit nofile 65536 65536
+DAEMON_OPTS=" -c /etc/apt-cacher-ng "
diff --git a/aptcacher/server.sls b/aptcacher/server.sls
index db08760..7a621d1 100644
--- a/aptcacher/server.sls
+++ b/aptcacher/server.sls
@@ -24,24 +24,30 @@
   - names: {{ server.services }}
   - watch:
     - file: /etc/apt-cacher-ng/acng.conf
-    - module: aptcacher_limits_override
 
-aptcacher_limits_override_dir:
-  file.directory:
-  - name: /etc/systemd/system/apt-cacher-ng.service.d/
-  - mode: 755
-  - makedirs: true
-
+{%- if grains.get('init', None) == 'systemd' %}
 aptcacher_limits_override:
   file.managed:
   - name: /etc/systemd/system/apt-cacher-ng.service.d/override.conf
   - source: salt://aptcacher/files/systemd_override.conf
+  - makedirs: true
   - template: jinja
-  - require:
-    - file: aptcacher_limits_override_dir
   module.run:
   - name: service.systemctl_reload
   - onchanges:
     - file: /etc/systemd/system/apt-cacher-ng.service.d/override.conf
+  - watch_in:
+      - service: aptcacher_services
+{%- else %}
+
+aptcacher_init:
+  file.managed:
+  - name: /etc/default/apt-cacher-ng
+  - source: salt://aptcacher/files/apt-cacher-ng-default
+  - mode: 644
+  - template: jinja
+  - watch_in:
+    - service: aptcacher_services
+{%- endif %}
 
 {%- endif %}