diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000..4fd75aa
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,6 @@
+Changelog
+==========
+
+
+* 2017-03-03 Tomáš Kukrál <tkukral@mirantis.com}
+- change default Salt-API port to 6969
diff --git a/salt/master/api.yml b/salt/master/api.yml
index 1c0c3fb..b5ede2f 100644
--- a/salt/master/api.yml
+++ b/salt/master/api.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    salt_master_api_port: 8000
+    salt_master_api_port: 6969
     salt_master_api_permissions:
     - '.*'
     - '@local'