diff --git a/COPYRIGHT b/COPYRIGHT
index 0c5c6b67ad..f249fb6d67 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,2 +1,14 @@
 Copyright 2012, 2013
 Daniel Pavel <daniel.pavel@gmail.com>
+
+    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, version 2.
+
+    This program 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/>.
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index 66eefda518..c8cb61e82b 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: Solaar
 Upstream-Contact: Daniel Pavel <daniel.pavel@gmail.com>
-Upstream-Source: http://github.com/pwr/Solaar
+Upstream-Source: http://github.com/pwr-Solaar
 
 Files: *
 Copyright: Copyright 2012-2013 Daniel Pavel
@@ -22,24 +22,12 @@ License: GPL-2
  On Debian systems, the complete text of the GNU General Public License,
  version 2, can be found in /usr/share/common-licenses/GPL-2.
 
-Files: share/icons/solaar*.svg
+Files: share/solaar/icons/solaar-init.svg share/solaar/icons/solaar-attention.svg share/solaar/icons/solaar.svg share/solaar-master.svg
+License: http://creativecommons.org/licenses/by-sa/3.0/
 Copyright: Copyright 2012-2013 Daniel Pavel
 License: LGPL
- 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
 
-Files: share/icons/light_*.png
+Files: share/solaar/icons/light_*.png
 Copyright: Oxygen Icons
 License: LGPL
  This library is free software; you can redistribute it and/or