diff --git a/debian/copyright_hints b/debian/copyright_hints
index a0249e5..056015e 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -6,7 +6,9 @@
 
 Files: autogen.sh
  debian/control
+ debian/not-installed
  debian/patches/README
+ debian/patches/series
  debian/rules
  debian/source/format
  debian/watch
@@ -104,10 +106,10 @@
  src/generator/test_pat/test_pat_I.c
  src/generator/test_pat/test_pat_L.c
  src/generator/test_pat/test_pat_R.c
-Copyright: 2010, Marko Cebokli http:lea.hamradio.si/~s57uuu
-  2011, Marko Cebokli http:lea.hamradio.si/~s57uuu
-  2012, Marko Cebokli http:lea.hamradio.si/~s57uuu
-  2013, Marko Cebokli http:lea.hamradio.si/~s57uuu
+Copyright: 2010, Marko Cebokli http://lea.hamradio.si/~s57uuu
+  2011, Marko Cebokli http://lea.hamradio.si/~s57uuu
+  2012, Marko Cebokli http://lea.hamradio.si/~s57uuu
+  2013, Marko Cebokli http://lea.hamradio.si/~s57uuu
 License: GPL-2+
  FIXME
 
@@ -149,7 +151,9 @@
  src/filter/cairogradient/cairogradient.c
  src/filter/cairoimagegrid/cairoimagegrid.c
  src/filter/colortap/colortap.c
+ src/filter/rgbnoise/rgbnoise.c
  src/filter/sigmoidaltransfer/sigmoidaltransfer.c
+ src/filter/softglow/softglow.c
  src/filter/spillsupress/spillsupress.c
  src/mixer2/cairoaffineblend/cairoaffineblend.c
  src/mixer2/cairoblend/cairoblend.c
@@ -185,47 +189,34 @@
 License: GPL-2+
  FIXME
 
+Files: include/blur.h
+ src/filter/squareblur/squareblur.c
+Copyright: 2004
+License: GPL-2+
+ FIXME
+
+Files: src/filter/glitch0r/glitch0r.c
+ src/filter/rgbsplit0r/rgbsplit0r.c
+Copyright: 2016, IDENT Software ~ http://identsoft.org
+License: GPL-2+
+ FIXME
+
+Files: src/filter/ndvi/gradientlut.hpp
+ src/filter/ndvi/ndvi.cpp
+Copyright: 2014, Brian Matherly (pez4brian@yahoo.com)
+License: LGPL-2.1+
+ FIXME
+
+Files: src/generator/nois0r/nois0r.cpp
+ src/generator/onecol0r/onecol0r.cpp
+Copyright: 2004-2005, Martin Bayer <martin@gephex.org>
+License: LGPL-2.1+
+ FIXME
+
 Files: include/msvc/inttypes.h
  include/msvc/stdint.h
 Copyright: 2006, Alexander Chemeris
   2006-2008, Alexander Chemeris
-License: BSD-2-clause
- FIXME
-
-Files: include/blur.h
- src/filter/squareblur/squareblur.c
-Copyright: 2004, --2005 Mathieu Guindon
-License: GPL-2+
- FIXME
-
-Files: src/filter/glitch0r/glitch0r.c
- src/filter/rgbsplit0r/rgbsplit0r.c
-Copyright: 2016, IDENT Software ~ http:identsoft.org
-License: GPL-2+
- FIXME
-
-Files: src/filter/rgbnoise/rgbnoise.c
- src/filter/softglow/softglow.c
-Copyright: 2012, Janne Liljeblad
-  s.
-License: GPL-2+
- FIXME
-
-Files: src/filter/ndvi/gradientlut.hpp
- src/filter/ndvi/ndvi.cpp
-Copyright: 2014, Brian Matherly (pez4brian@yahoo.com)
-License: LGPL-2.1+
- FIXME
-
-Files: src/generator/nois0r/nois0r.cpp
- src/generator/onecol0r/onecol0r.cpp
-Copyright: 2004-2005, Martin Bayer <martin@gephex.org>
-License: LGPL-2.1+
- FIXME
-
-Files: debian/copyright
- debian/copyright_hints
-Copyright: -format/1.0/
 License: UNKNOWN
  FIXME
 
@@ -233,6 +224,11 @@
  src/filter/vertigo/vertigo.c
 Copyright: 2001, FUKUCHI Kentarou
 License: UNKNOWN
+ FIXME
+
+Files: debian/copyright
+Copyright: the frei0r-team (as listed in AUTHORS)
+License: GPL-2
  FIXME
 
 Files: src/filter/vectorscope/vectorscope.c
@@ -265,12 +261,6 @@
 Copyright: 2004-2005, Pawel T. Jochym <Jochym jochym at ifj edu pl>.
   2005-2006, Gilles Caulier <caulier dot gilles at kdemail dot net>.
   2009, Dan Dennedy <dan@dennedy.org>
-  s.
-License: GPL-2+
- FIXME
-
-Files: ltmain.sh
-Copyright: 1996-2015, Free Software Foundation, Inc.
 License: GPL-2+
  FIXME
 
@@ -309,7 +299,7 @@
  FIXME
 
 Files: src/filter/elastic_scale/elastic_scale.cpp
-Copyright: 2018, Matthias Schnöll (matthias.schnoell AT gmail.com)
+Copyright: 2018, Matthias Schnöll (matthias.schnoell AT gmail.com)
 License: GPL-2+
  FIXME
 
@@ -352,7 +342,6 @@
 
 Files: src/filter/medians/ctmf.h
 Copyright: 2006, Simon Perreault
-  bert, "Median Filtering in Constant Time",
 License: GPL-3+
  FIXME
 
@@ -389,6 +378,11 @@
 License: UNKNOWN
  FIXME
 
+Files: debian/copyright_hints
+Copyright: NONE
+License: UNKNOWN
+ FIXME
+
 Files: src/filter/nervous/nervous.cpp
 Copyright: 2002, TANNENBAUM Edo
 License: UNKNOWN
@@ -399,3 +393,8 @@
 License: UNKNOWN
  FIXME
 
+Files: src/filter/aech0r/aech0r.cpp
+Copyright: 2018-2020, d-j-a-y & vloop
+License: UNKNOWN
+ FIXME
+