diff --git a/debian/changelog b/debian/changelog
index 5a14b30..75b4e9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hiyapyco (0.5.1-2) UNRELEASED; urgency=medium
+
+  * Initial upload (Closes: #1027055)
+  * Updated debian/*
+    - d/copyright formatting
+    - d/watch added
+  * Added myself to uploaders
+
+ -- Steffen Moeller <moeller@debian.org>  Tue, 27 Dec 2022 11:15:41 +0100
+  
 hiyapyco (0.5.1-1) stable; urgency=medium
 
   * release version 0.5.1
diff --git a/debian/control b/debian/control
index f8f5331..cbdaad6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: hiyapyco
 Maintainer: Klaus Zerwes zero-sys.net <zerwes@users.noreply.github.com>
+Uploaders: Steffen Moeller <moeller@debian.org>
 Section: python
 Priority: optional
 Build-Depends: python3-setuptools,
@@ -17,7 +18,7 @@ Rules-Requires-Root: no
 Package: python3-hiyapyco
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
-Description: Hierarchical Yaml Python Config
+Description: Hierarchical YAML Python Config
  A simple python lib allowing hierarchical overlay of config files
  in YAML syntax, offering different merge methods and variable
  interpolation based on jinja2.
diff --git a/debian/copyright b/debian/copyright
index ffb9cd5..223f617 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,30 @@
-Copyright: 2014 - 2022 Klaus Zerwes zero-sys.net
-
-License:
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://github.com/zerwes/hiyapyco
+Upstream-Name: HiYaPyCo
 
-   This package is free software.  
-   This software is licensed under the terms of the
-   GNU GENERAL PUBLIC LICENSE version 3 or later,
-   as published by the Free Software Foundation.  
+Files: *
+Copyright: 2014 - 2022 Klaus Zerwes zero-sys.net
+License: GPL-3.0+
 
-   A copy of the license is included here:
-   /usr/share/common-licenses/GPL
+Files:
+ debian/*
+Copyright: 2014 - 2022 Klaus Zerwes zero-sys.net
+           2022 Updates by Steffen Moeller <moeller@debian.org>
+License: GPL-3.0+
 
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+Comment:
+ 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/debian/rules
index e7242eb..fe7c2c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,8 @@
 #!/usr/bin/make -f
 
-PACKAGE_PYTHON3=python3-hiyapyco
-
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_clean:
-	rm -rf HiYaPyCo.egg-info
+	rm -rf HiYaPyCo.egg-info dist
 	dh_auto_clean