diff --git a/debian/copyright b/debian/copyright
index a9503a1d3f07a63515444a6ba421bc2de17f0cfc..bef904974126dcad719f031bb9bc9b562d4491f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,33 +13,13 @@ Files: debian/*
 Copyright: 2013—2019 Andrej Shadura <andrewsh@debian.org>
 License: ISC
 
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- This software is provided 'as is' and without any warranty, express or
- implied. In no event shall the authors be liable for any damages arising
- from the use of this software.
-
-Files: bsdstubs.c
+Files: libpkgconf/bsdstubs.c
 Copyright:
  1998 Todd C. Miller <Todd.Miller@courtesan.com>
  2012 William Pitcock <nenolod@dereferenced.org>
 License: ISC
- Permission to use, copy, modify, and distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-Files: getopt_long.c
+Files: cli/getopt_long.c
 Copyright:
  2000 The NetBSD Foundation, Inc.
  2002 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -75,7 +55,7 @@ License: BSD-4
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-Files: getopt_long.h
+Files: cli/getopt_long.h
 Copyright: 2000 The NetBSD Foundation, Inc.
 License: BSD-2
  This code is derived from software contributed to The NetBSD Foundation
@@ -104,11 +84,13 @@ License: BSD-2
 
 Files: install-sh
 Copyright: 1994 X Consortium
-License:
+Comment:
  This originates from X11R5 (mit/util/scripts/install.sh), which was
  later released in X11R6 (xc/config/util/install.sh) with the
  following copyright and license.
  .
+ FSF changes to this file are in the public domain.
+License: X11
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
  deal in the Software without restriction, including without limitation the
@@ -130,8 +112,6 @@ License:
  be used in advertising or otherwise to promote the sale, use or other deal-
  ings in this Software without prior written authorization from the X Consor-
  tium.
- .
- FSF changes to this file are in the public domain.
 
 Files: pkg.m4
 Copyright: 2004 Scott James Remnant <scott@netsplit.com>
@@ -157,3 +137,17 @@ 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.
+
+
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.