diff --git a/apt_cacher_ng/files/acng.conf.Debian b/apt_cacher_ng/files/acng.conf.Debian
new file mode 100644
index 0000000..803ef03
--- /dev/null
+++ b/apt_cacher_ng/files/acng.conf.Debian
@@ -0,0 +1,21 @@
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
+CacheDir: /var/cache/apt-cacher-ng
+LogDir: /var/log/apt-cacher-ng
+SupportDir: /usr/lib/apt-cacher-ng
+
+Port: {{ server.bind.port }}
+BindAddress: {{ server.bind.address }}
+
+ReportPage: acng-report.html
+ExTreshold: 4
+LocalDirs: acng-doc /usr/share/doc/apt-cacher-ng
+
+{%- if server.proxy is defined %}
+Proxy: {{ server.proxy }}
+{%- endif %}
+{%- if server.passthruurl is defined %}
+PassThroughPattern: ({{ server.passthruurl|join('|')|replace(".","\.") }}):(80|443)
+{%- endif %}
+{%- if server.passhthrupattern is defined %}
+PfilePatternEx: {{ server.passhthrupattern|join('|') }}
+{%- endif %}
diff --git a/apt_cacher_ng/init.sls b/apt_cacher_ng/init.sls
new file mode 100644
index 0000000..3b2573c
--- /dev/null
+++ b/apt_cacher_ng/init.sls
@@ -0,0 +1,5 @@
+
+include:
+{%- if pillar.apt_cacher_ng.server is defined %}
+- apt_cacher_ng.server
+{%- endif %}
diff --git a/apt_cacher_ng/map.jinja b/apt_cacher_ng/map.jinja
new file mode 100644
index 0000000..35e33b1
--- /dev/null
+++ b/apt_cacher_ng/map.jinja
@@ -0,0 +1,12 @@
+{% set server = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['apt-cacher-ng'],
+        'services': ['apt-cacher-ng'],
+        'notification': False,
+    },
+    'RedHat': {
+        'pkgs': ['apt-cacher'],
+        'services': ['apt-cacher'],
+        'notification': False,
+    },
+    }, merge=pillar.apt_cacher_ng.get('server', {})) %}
diff --git a/apt_cacher_ng/meta/sensu.yml b/apt_cacher_ng/meta/sensu.yml
new file mode 100644
index 0000000..4300306
--- /dev/null
+++ b/apt_cacher_ng/meta/sensu.yml
@@ -0,0 +1,8 @@
+# Sample check
+check:
+  local_apt_cacher_ng_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C apt-cacher -u apt-cacher -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-aptcacher-server
diff --git a/apt_cacher_ng/meta/sphinx.yml b/apt_cacher_ng/meta/sphinx.yml
new file mode 100644
index 0000000..0b4f295
--- /dev/null
+++ b/apt_cacher_ng/meta/sphinx.yml
@@ -0,0 +1,12 @@
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
+# Fill in documentation details
+doc:
+  name: apt_cacher_ng
+  description: Some service info
+  role:
+    server:
+      name: server
+      param:
+        some_param:
+          name: "Some name"
+          value: "some value"
diff --git a/apt_cacher_ng/server.sls b/apt_cacher_ng/server.sls
new file mode 100644
index 0000000..8149ef5
--- /dev/null
+++ b/apt_cacher_ng/server.sls
@@ -0,0 +1,28 @@
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
+{%- if server.enabled %}
+
+apt_cacher_ng_packages:
+  pkg.installed:
+  - names: {{ server.pkgs }}
+
+/etc/apt-cacher-ng:
+  file.directory:
+  - mode: 755
+  - makedirs: true
+
+/etc/apt-cacher-ng/acng.conf:
+  file.managed:
+  - source: salt://apt_cacher_ng/files/acng.conf.{{ grains.os_family }}
+  - template: jinja
+  - require:
+    - file: /etc/apt-cacher-ng
+    - pkg: apt_cacher_ng_packages
+
+apt_cacher_ng_services:
+  service.running:
+  - enable: true
+  - names: {{ server.services }}
+  - watch:
+    - file: /etc/apt-cacher-ng/acng.conf
+
+{%- endif %}