diff --git a/deb/changelog b/deb/changelog
new file mode 100644
index 00000000..30863069
--- /dev/null
+++ b/deb/changelog
@@ -0,0 +1,5 @@
+zabbix-cli (1.6.0-1) unstable; urgency=low
+
+  * Initial upload to Debian (Closes: #842337):
+
+ -- Petter Reinholdtsen <pere@debian.org>  Mon, 17 Oct 2016 11:41:24 +0000
diff --git a/debian/compat b/deb/compat
similarity index 100%
rename from debian/compat
rename to deb/compat
diff --git a/debian/control b/deb/control
similarity index 97%
rename from debian/control
rename to deb/control
index ab455e3d..936127eb 100644
--- a/debian/control
+++ b/deb/control
@@ -5,7 +5,7 @@ Maintainer: Petter Reinholdtsen <pere@debian.org>
 Build-Depends: debhelper (>= 9~)
  , python | python-all | python-dev | python-all-dev
  , python-setuptools
-Standards-Version: 3.9.8
+Standards-Version: 3.9.6
 Homepage: https://github.com/usit-gd/zabbix-cli
 Vcs-Browser: https://github.com/usit-gd/zabbix-cli
 Vcs-Git: https://github.com/usit-gd/zabbix-cli
diff --git a/debian/copyright b/deb/copyright
similarity index 74%
rename from debian/copyright
rename to deb/copyright
index d9e02cce..dc29a98a 100644
--- a/debian/copyright
+++ b/deb/copyright
@@ -10,7 +10,7 @@ License:   BSD-3-Clause
 
 Files:     zabbix_cli/pyzabbix.py
 Copyright: 2016 Luke Cyca <me@lukecyca.com>
-License:   LGPL 2.1
+License:   LGPL-2.1
 
 License: GPL-3.0+
  This package is free software; you can redistribute it and/or modify
@@ -55,3 +55,22 @@ License:   BSD-3-Clause
  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License:   LGPL-2.1
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/rules b/deb/rules
similarity index 100%
rename from debian/rules
rename to deb/rules
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 13bbc33e..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-zabbix-cli (1.6.0-1) UNSTABLE; urgency=low
-
-  * Initial upload to Debian (Closes: #842337):
-
- -- Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no>  Wed, 30 Nov 2016 12:29:17 +0000
diff --git a/rpm/zabbix-cli.spec b/rpm/zabbix-cli.spec
index 4127d543..31671dce 100644
--- a/rpm/zabbix-cli.spec
+++ b/rpm/zabbix-cli.spec
@@ -40,13 +40,21 @@ mkdir -p %{buildroot}%{_defaultdocdir}/zabbix-cli-%{version}
 %{python2_sitelib}/zabbix_cli/
 %{_bindir}/zabbix-cli*
 %dir %{_datadir}/zabbix-cli/
-%dir %{_defaultdocdir}/zabbix-cli/
+%dir %{_defaultdocdir}/zabbix-cli-%{version}
 %{_datadir}/zabbix-cli/zabbix-cli.conf
 %doc LICENSE docs/manual.rst
 
 %changelog
-* Tue Nov 22 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.6.0-1
-- New release
+* Wed Nov 30 2016 Rafael Martinez Guerrero <r.m.guerrero@usit.uio.no> - 1.6.0-1
+- Add support for multilevel configuration [Issue: #8]
+- Add new command to define maintenance definitions [Issue: #9]
+- Add new command to remove maintenance definitions [Issue: #11]
+- Add new command to show maintenance definitions [issue: #10]
+- Add new command to show maintenance periods [Issue: #14]
+- Add new command to show active zabbix-cli configuration parameters and configuration files [Issue: #13]
+- Add RPM specs file
+- Add DEBIAN files
+- Bugfix: Fix zabbix-cli-init parameters parsing. We use the argparse module now.
 
 * Sat Oct 29 2016 Volker Froehlich <volker27@gmx.at> - 1.5.4-5
 - Match the actual license claimed in the code