diff --git a/.gitignore b/.gitignore
index bacd7c7..aa8e42a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.kitchen
 tests/build/
 *.swp
 *.pyc
diff --git a/Makefile b/Makefile
index c6a75af..1043fbe 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,37 @@
 SALTENVDIR=/usr/share/salt-formulas/env
 RECLASSDIR=/usr/share/salt-formulas/reclass
 FORMULANAME=$(shell grep name: metadata.yml|head -1|cut -d : -f 2|grep -Eo '[a-z0-9\-\_]*')
+VERSION=$(shell grep version: metadata.yml|head -1|cut -d : -f 2|grep -Eo '[a-z0-9\.\-\_]*')
+VERSION_MAJOR := $(shell echo $(VERSION)|cut -d . -f 1-2)
+VERSION_MINOR := $(shell echo $(VERSION)|cut -d . -f 3)
+
+NEW_MAJOR_VERSION ?= $(shell date +%Y.%m|sed 's,\.0,\.,g')
+NEW_MINOR_VERSION ?= $(shell /bin/bash -c 'echo $$[ $(VERSION_MINOR) + 1 ]')
+
+MAKE_PID := $(shell echo $$PPID)
+JOB_FLAG := $(filter -j%, $(subst -j ,-j,$(shell ps T | grep "^\s*$(MAKE_PID).*$(MAKE)")))
+
+ifneq ($(subst -j,,$(JOB_FLAG)),)
+JOBS := $(subst -j,,$(JOB_FLAG))
+else
+JOBS := 1
+endif
+
+KITCHEN_LOCAL_YAML?=.kitchen.yml
+KITCHEN_OPTS?="--concurrency=$(JOBS)"
+KITCHEN_OPTS_CREATE?=""
+KITCHEN_OPTS_CONVERGE?=""
+KITCHEN_OPTS_VERIFY?=""
+KITCHEN_OPTS_TEST?=""
 
 all:
 	@echo "make install - Install into DESTDIR"
 	@echo "make test    - Run tests"
+	@echo "make kitchen - Run Kitchen CI tests (create, converge, verify)"
 	@echo "make clean   - Cleanup after tests run"
+	@echo "make release-major  - Generate new major release"
+	@echo "make release-minor  - Generate new minor release"
+	@echo "make changelog      - Show changes since last release"
 
 install:
 	# Formula
@@ -14,6 +40,7 @@
 	cp -a $(FORMULANAME) $(DESTDIR)/$(SALTENVDIR)/
 	[ ! -d _modules ] || cp -a _modules $(DESTDIR)/$(SALTENVDIR)/
 	[ ! -d _states ] || cp -a _states $(DESTDIR)/$(SALTENVDIR)/ || true
+	[ ! -d _grains ] || cp -a _grains $(DESTDIR)/$(SALTENVDIR)/ || true
 	# Metadata
 	[ -d $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME) ] || mkdir -p $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
 	cp -a metadata/service/* $(DESTDIR)/$(RECLASSDIR)/service/$(FORMULANAME)
@@ -21,6 +48,71 @@
 test:
 	[ ! -d tests ] || (cd tests; ./run_tests.sh)
 
+release-major: check-changes
+	@echo "Current version is $(VERSION), new version is $(NEW_MAJOR_VERSION)"
+	@[ $(VERSION_MAJOR) != $(NEW_MAJOR_VERSION) ] || (echo "Major version $(NEW_MAJOR_VERSION) already released, nothing to do. Do you want release-minor?" && exit 1)
+	echo "$(NEW_MAJOR_VERSION)" > VERSION
+	sed -i 's,version: .*,version: "$(NEW_MAJOR_VERSION)",g' metadata.yml
+	[ ! -f debian/changelog ] || dch -v $(NEW_MAJOR_VERSION) -m --force-distribution -D `dpkg-parsechangelog -S Distribution` "New version"
+	make genchangelog-$(NEW_MAJOR_VERSION)
+	(git add -u; git commit -m "Version $(NEW_MAJOR_VERSION)")
+	git tag -s -m $(NEW_MAJOR_VERSION) $(NEW_MAJOR_VERSION)
+
+release-minor: check-changes
+	@echo "Current version is $(VERSION), new version is $(VERSION_MAJOR).$(NEW_MINOR_VERSION)"
+	echo "$(VERSION_MAJOR).$(NEW_MINOR_VERSION)" > VERSION
+	sed -i 's,version: .*,version: "$(VERSION_MAJOR).$(NEW_MINOR_VERSION)",g' metadata.yml
+	[ ! -f debian/changelog ] || dch -v $(VERSION_MAJOR).$(NEW_MINOR_VERSION) -m --force-distribution -D `dpkg-parsechangelog -S Distribution` "New version"
+	make genchangelog-$(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+	(git add -u; git commit -m "Version $(VERSION_MAJOR).$(NEW_MINOR_VERSION)")
+	git tag -s -m $(NEW_MAJOR_VERSION) $(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+
+check-changes:
+	@git log --pretty=oneline --decorate $(VERSION)..HEAD | grep -Eqc '.*' || (echo "No new changes since version $(VERSION)"; exit 1)
+
+changelog:
+	git log --pretty=short --invert-grep --grep="Merge pull request" --decorate $(VERSION)..HEAD
+
+genchangelog: genchangelog-$(VERSION_MAJOR).$(NEW_MINOR_VERSION)
+
+genchangelog-%:
+	$(eval NEW_VERSION := $(patsubst genchangelog-%,%,$@))
+	(echo "=========\nChangelog\n=========\n"; \
+	(echo $(NEW_VERSION);git tag) | sort -r | grep -E '^[0-9\.]+' | while read i; do \
+	    cur=$$i; \
+	    test $$i = $(NEW_VERSION) && i=HEAD; \
+	    prev=`(echo $(NEW_VERSION);git tag)|sort|grep -E '^[0-9\.]+'|grep -B1 "$$cur\$$"|head -1`; \
+	    echo "Version $$cur\n=============================\n"; \
+	    git log --pretty=short --invert-grep --grep="Merge pull request" --decorate $$prev..$$i; \
+	    echo; \
+	done) > CHANGELOG.rst
+
+kitchen-check:
+	@[ -e $(KITCHEN_LOCAL_YAML) ] || (echo "Kitchen tests not available, there's no $(KITCHEN_LOCAL_YAML)." && exit 1)
+
+kitchen: kitchen-check kitchen-create kitchen-converge kitchen-verify kitchen-list
+
+kitchen-create: kitchen-check
+	kitchen create ${KITCHEN_OPTS} ${KITCHEN_OPTS_CREATE}
+	[ "$(shell echo $(KITCHEN_LOCAL_YAML)|grep -Eo docker)" = "docker" ] || sleep 120
+
+kitchen-converge: kitchen-check
+	kitchen converge ${KITCHEN_OPTS} ${KITCHEN_OPTS_CONVERGE} &&\
+	kitchen converge ${KITCHEN_OPTS} ${KITCHEN_OPTS_CONVERGE}
+
+kitchen-verify: kitchen-check
+	[ ! -d tests/integration ] || kitchen verify -t tests/integration ${KITCHEN_OPTS} ${KITCHEN_OPTS_VERIFY}
+	[ -d tests/integration ]   || kitchen verify ${KITCHEN_OPTS} ${KITCHEN_OPTS_VERIFY}
+
+kitchen-test: kitchen-check
+	[ ! -d tests/integration ] || kitchen test -t tests/integration ${KITCHEN_OPTS} ${KITCHEN_OPTS_TEST}
+	[ -d tests/integration ]   || kitchen test ${KITCHEN_OPTS} ${KITCHEN_OPTS_TEST}
+
+kitchen-list: kitchen-check
+	kitchen list
+
 clean:
+	[ ! -x "$(shell which kitchen)" ] || kitchen destroy
+	[ ! -d .kitchen ] || rm -rf .kitchen
 	[ ! -d tests/build ] || rm -rf tests/build
 	[ ! -d build ] || rm -rf build
diff --git a/apt_cacher_ng/init.sls b/apt_cacher_ng/init.sls
deleted file mode 100644
index 3b2573c..0000000
--- a/apt_cacher_ng/init.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-
-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
deleted file mode 100644
index 35e33b1..0000000
--- a/apt_cacher_ng/map.jinja
+++ /dev/null
@@ -1,12 +0,0 @@
-{% 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/sphinx.yml b/apt_cacher_ng/meta/sphinx.yml
deleted file mode 100644
index 0b4f295..0000000
--- a/apt_cacher_ng/meta/sphinx.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-{%- 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/files/acng.conf.Debian b/aptcacher/files/acng.conf.Debian
similarity index 86%
rename from apt_cacher_ng/files/acng.conf.Debian
rename to aptcacher/files/acng.conf.Debian
index 803ef03..be09eb5 100644
--- a/apt_cacher_ng/files/acng.conf.Debian
+++ b/aptcacher/files/acng.conf.Debian
@@ -1,4 +1,4 @@
-{%- from "apt_cacher_ng/map.jinja" import server with context %}
+{%- from "aptcacher/map.jinja" import server with context -%}
 CacheDir: /var/cache/apt-cacher-ng
 LogDir: /var/log/apt-cacher-ng
 SupportDir: /usr/lib/apt-cacher-ng
@@ -19,3 +19,6 @@
 {%- if server.passhthrupattern is defined %}
 PfilePatternEx: {{ server.passhthrupattern|join('|') }}
 {%- endif %}
+{#-
+    vim: syntax=jinja
+-#}
diff --git a/aptcacher/init.sls b/aptcacher/init.sls
new file mode 100644
index 0000000..12e633c
--- /dev/null
+++ b/aptcacher/init.sls
@@ -0,0 +1,5 @@
+
+include:
+{%- if pillar.aptcacher.server is defined %}
+- aptcacher.server
+{%- endif %}
diff --git a/aptcacher/map.jinja b/aptcacher/map.jinja
new file mode 100644
index 0000000..3e9be8d
--- /dev/null
+++ b/aptcacher/map.jinja
@@ -0,0 +1,20 @@
+{% set server = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['apt-cacher-ng'],
+        'services': ['apt-cacher-ng'],
+        'notification': False,
+        'bind': {
+            'address': '0.0.0.0',
+            'port': 3142,
+        },
+    },
+    'RedHat': {
+        'pkgs': ['apt-cacher'],
+        'services': ['apt-cacher'],
+        'notification': False,
+        'bind': {
+            'address': '0.0.0.0',
+            'port': 3142,
+        },
+    },
+    }, merge=pillar.aptcacher.get('server', {})) %}
diff --git a/apt_cacher_ng/meta/sensu.yml b/aptcacher/meta/sensu.yml
similarity index 88%
rename from apt_cacher_ng/meta/sensu.yml
rename to aptcacher/meta/sensu.yml
index 4300306..c58a28c 100644
--- a/apt_cacher_ng/meta/sensu.yml
+++ b/aptcacher/meta/sensu.yml
@@ -1,6 +1,6 @@
 # Sample check
 check:
-  local_apt_cacher_ng_proc:
+  local_aptcacher_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
diff --git a/aptcacher/meta/sphinx.yml b/aptcacher/meta/sphinx.yml
new file mode 100644
index 0000000..85f8150
--- /dev/null
+++ b/aptcacher/meta/sphinx.yml
@@ -0,0 +1,9 @@
+{%- from "apt_cacher_ng/map.jinja" import server with context %}
+# Fill in documentation details
+doc:
+  name: aptcacher
+  description: APT caching service
+  role:
+    server:
+      name: server
+      param: {}
diff --git a/apt_cacher_ng/server.sls b/aptcacher/server.sls
similarity index 64%
rename from apt_cacher_ng/server.sls
rename to aptcacher/server.sls
index 8149ef5..88ccf16 100644
--- a/apt_cacher_ng/server.sls
+++ b/aptcacher/server.sls
@@ -1,7 +1,7 @@
-{%- from "apt_cacher_ng/map.jinja" import server with context %}
+{%- from "aptcacher/map.jinja" import server with context %}
 {%- if server.enabled %}
 
-apt_cacher_ng_packages:
+aptcacher_packages:
   pkg.installed:
   - names: {{ server.pkgs }}
 
@@ -12,13 +12,13 @@
 
 /etc/apt-cacher-ng/acng.conf:
   file.managed:
-  - source: salt://apt_cacher_ng/files/acng.conf.{{ grains.os_family }}
+  - source: salt://aptcacher/files/acng.conf.{{ grains.os_family }}
   - template: jinja
   - require:
     - file: /etc/apt-cacher-ng
-    - pkg: apt_cacher_ng_packages
+    - pkg: aptcacher_packages
 
-apt_cacher_ng_services:
+aptcacher_services:
   service.running:
   - enable: true
   - names: {{ server.services }}
diff --git a/debian/changelog b/debian/changelog
index 67c3c69..7851459 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-salt-formula-apt-cacher-ng (0.1) trusty; urgency=medium
+salt-formula-aptcacher (0.2) trusty; urgency=medium
 
   * Initial release
 
- -- salt-formulas@lists.launchpad.net  Thu, 13 Aug 2015 23:23:41 +0200
+ -- Filip Pytloun <filip@pytloun.cz>  Mon, 27 Mar 2017 10:53:30 +0200
diff --git a/debian/control b/debian/control
index d58f97a..ddd2e7d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
 Source: salt-formula-apt-cacher-ng
-Maintainer: salt-formulas@lists.launchpad.net
+Maintainer: Salt Formulas Community <salt-formulas@lists.launchpad.net>
 Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 9), salt-master, python, python-yaml
 Standards-Version: 3.9.6
 Homepage: http://www.mirantis.com
-Vcs-Browser: https://github.com/salt-formula/salt-formula-apt-cacher-ng
-Vcs-Git: https://github.com/salt-formula/salt-formula-apt-cacher-ng.git
+Vcs-Browser: https://github.com/salt-formula/salt-formula-aptcacher
+Vcs-Git: https://github.com/salt-formula/salt-formula-aptcacher.git
 
-Package: salt-formula-apt-cacher-ng
+Package: salt-formula-aptcacher
 Architecture: all
 Depends: ${misc:Depends}, salt-master, reclass
-Description: apt-cacher-ng salt formula
+Description: aptcacher salt formula
  Install and configure apt-cacher-ng system.
diff --git a/debian/copyright b/debian/copyright
index 6ee7bf9..5903b1b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: salt-formula-apt-cacher-ng
+Upstream-Name: salt-formula-aptcacher
 Upstream-Contact:
-Source: https://github.com/salt-formula/salt-formula-apt-cacher-ng
+Source: https://github.com/salt-formula/salt-formula-aptcacher
 
 Files: *
 Copyright: 2014-2017 Mirantis Inc. et al
diff --git a/metadata.yml b/metadata.yml
index 23927a6..ac450e1 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
-name: "apt_cacher_ng"
+name: "aptcacher"
 version: "0.1"
-source: "https://github.com/salt-formula/salt-formula-apt-cacher-ng"
+source: "https://github.com/salt-formula/salt-formula-aptcacher"
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 3c25a6e..f817ab7 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,9 +1,9 @@
 applications:
-- apt_cacher_ng
+  - aptcacher
 classes:
-- service.apt_cacher_ng.support
+  - service.aptcacher.support
 parameters:
-  apt_cacher_ng:
+  aptcacher:
     server:
       enabled: true
       bind:
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index fb6744c..61cf216 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -1,5 +1,5 @@
 parameters:
-  apt_cacher_ng:
+  aptcacher:
     _support:
       collectd:
         enabled: false