diff --git a/debian/changelog b/debian/changelog
index 4fa57d96..8fb6a1d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ guh (0.1.7) utopic; urgency=medium
 
   * implement StateEvaluators
 
- -- Michael Zanetti <micha@noneyet>  Sun, 08 Jun 2014 23:27:31 +0200
+ -- Michael Zanetti <michael_zanetti@gmx.net>  Sun, 08 Jun 2014 23:27:31 +0200
 
 guh (0.1.6) utopic; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 59c22642..e1386b5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,17 @@
-This package was debianized by Michael Zanetti <michael_zanetti@gmx.net> on
-Sat, 09 Apr 2011 18:13:12 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Author: Michael Zanetti <michael_zanetti@gmx.net>
+        Simon Stürz <stuerz.simon@gmail.com>
+Download: http://www.github.com/guh
 
-Upstream Author(s):
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-    Michael Zanetti <michael_zanetti@gmx.net>
+Files: *
+Copyright: (C) 2014 Michael Zanetti <michael_zanetti@gmx.net>
+               2014 Simon Stürz <stuerz.simon@gmail.com>
+License: GPL-2+
 
-Copyright:
-
-    <Copyright (C) 2011 Michael Zanetti>
-
-License:
-
-    This package 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 2 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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2011, unknown <micha@unknown> and
-is licensed under the GPL, see above.
-
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.
+Files: debian/*
+Copyright: (C) 2014 Michael Zanetti <michael_zanetti@gmx.net>
+License: GPL-2+