diff --git a/debian/changelog b/debian/changelog
index 5057d5869c81141dac2d33043a0d69b8015217db..67c8fe39d9d660ecddc2c4d95852cab729a9d68d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+snf-image-creator (0.3-1) stable; urgency=low
+
+  * New upstream version
+
+ -- Nikos Skalkotos <skalkoto@grnet.gr>  Wed, 05 Jun 2013 13:02:34 +0300
+
 snf-image-creator (0.1.0-1) stable; urgency=low
 
   * New upstream version
diff --git a/debian/control b/debian/control
index 13337d24a88da8bfb23b2770f24c1e1e79675004..a9f11ee122c369bff59062220856ea7901780b2b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,18 @@ Source: snf-image-creator
 Section: python
 Priority: optional
 Maintainer: Nikos Skalkotos <skalkoto@grnet.gr>
-Build-Depends: debhelper (>= 8), python-all (>= 2.5)
-Standards-Version: 3.9.2
+XSBC-Original-Maintainer: Nikos Skalkotos <skalkoto@grnet.gr>
+Build-Depends: debhelper (>= 8), python-all (>= 2.5), python-setuptools,
+ python-sphinx
+Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 Homepage: https://code.grnet.gr/projects/snf-image-creator
 
 Package: snf-image-creator
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-progress (>=1.0.2), python-ansicolors, python-dialog, kamaki, python-guestfs, python-sendfile
-XB-Python-Version: ${python:Versions}
+Depends: ${misc:Depends}, ${python:Depends}, python-progress (>=1.0.2),
+ python-setuptools, python-ansicolors, python-dialog, kamaki(>=0.8),
+ python-guestfs, python-sendfile, python-parted, rsync, libguestfs-tools
 Description: Synnefo Image Creator
  snf-image-creator is a command line tool for creating OS images to be used
  with synnefo.
diff --git a/debian/copyright b/debian/copyright
index e53c10e68e7d25499b07c0a2cd2ca54f9040eb27..36e9a4d2e5ac49d946fd44a3b36302f3c33dcd56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,9 +5,7 @@ Source: https://code.grnet.gr/projects/snf-image-creator
 
 Files: *
 Copyright: Copyright (C) 2011, 2012 GRNET S.A.
-Licence: BSD-2-clause
-
-Licence: BSD-2-clause
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or
  without modification, are permitted provided that the following
  conditions are met:
diff --git a/debian/docs b/debian/docs
index 03478c46b133e336e0f30af48486ba551fa33586..1cd1956424c82c7a619b8eabb7b274e1115bb460 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,3 @@
-docs/*.rst
-docs/snapshots/*
+docs/_build/html
+AUTHORS
+README
diff --git a/debian/rules b/debian/rules
index 0bd0b24329403f3a4011049c6c5cf901cb72f9de..13797f9ac147cbf4c9e9645dcc34ac195f7ff4da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,11 @@
 %:
 	dh $@ --with python2
 
+override_dh_auto_build:
+	cd docs && make html && make man && rm -rf _build/html/man && rm -rf _build/doctrees
+
+override_dh_installman:
+	dh_installman docs/_build/man/*.1
+
+override_dh_installchangelogs:
+	dh_installchangelogs ChangeLog