diff --git a/debian/changelog b/debian/changelog
index 45e84df..2b9fc29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+golang-github-go-kit-kit (0.6.0-2) UNRELEASED; urgency=medium
+
+  * Rework debian/copyright for proper attribution, as the previous upload was
+    rejected for this reason.
+
+ -- Martín Ferrari <tincho@debian.org>  Tue, 12 Dec 2017 00:41:15 +0000
+
 golang-github-go-kit-kit (0.6.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #883825)
diff --git a/debian/copyright b/debian/copyright
index 39c4ece..2beadff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,36 @@
 Files: *
 Copyright: 2015 Peter Bourgon
 License: Expat
+
+Files: log/term/*
+Copyright: 2015 Peter Bourgon
+License: Expat
+Comment: Apart from the files described in the next section, this whole
+ directory is not properly licensed.
+ .
+ The LICENSE file in the directory is copied verbatim from the log15 project.
+ .
+ The log/term/colorwriter_windows.go file claims to be based on
+ github.com/mattn/go-colorable, but the code seems to be divergent enough, and
+ there is no explicit copyright assignment, so I am assuming it is governed by
+ the top-level LICENSE file.
+ .
+ The rest of the files in that directory were created by members of the go-kit
+ project and did not add any copyright claim, thus I am assuming they are also
+ under the main LICENSE.
+ .
+ To clarify all these matters, a bug has been opened at
+ https://github.com/go-kit/kit/issues/640
+
+Files: log/term/terminal_*
+Copyright: 2014 Simon Eskildsen
+License: Expat
+Comment: Files from http://gopkg.in/inconshreveable/log15.v2/term, imported in
+ 2015 according to git history. In turn, these files have the following header:
+ // Based on ssh/terminal:
+ // Copyright 2013 The Go Authors. All rights reserved.
+ // Use of this source code is governed by a BSD-style
+ // license that can be found in the LICENSE file.
 
 Files: debian/*
 Copyright: 2017 Martín Ferrari <tincho@tincho.org>