diff --git a/AUTHORS b/AUTHORS
index b192214e0..242d28ee2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,7 +30,7 @@ List of Copyright holders
   Copyright (C) 1999-2003 Symas Corporation.
   Copyright (C) 1998-2003 Hallvard B. Furuseth.
   Copyright (C) 1992-1996 Regents of the University of Michigan.
-
+  Copyright (C) 2000 Dimitrios Souflis
 
 
 Authors with a FSF copyright assignment
@@ -211,6 +211,10 @@ Alexandre Julliard.
 The gpg-zip documentation is based on the manpage for gpg-zip, written
 by Colin Tuckley and Daniel Leidert for the GNU/Debian distribution.
 
+The test driver is based on TinySCHEME by Dimitrios Souflis and
+available under a permissive license.  For the terms see the file
+tests/gpgscm/LICENSE.TinySCHEME.
+
 
 Copyright
 =========
diff --git a/build-aux/speedo/w32/pkg-copyright.txt b/build-aux/speedo/w32/pkg-copyright.txt
index 9495bcd8a..daf288118 100644
--- a/build-aux/speedo/w32/pkg-copyright.txt
+++ b/build-aux/speedo/w32/pkg-copyright.txt
@@ -1,5 +1,5 @@
 Here is a list with collected copyright notices. For details see the
-description of each individual package.  [Compiled by wk 2016-04-20]
+description of each individual package.  [Compiled by wk 2016-06-17]
 
 GnuPG is
 
@@ -18,6 +18,7 @@ GnuPG is
   Copyright (C) 1999-2003 Symas Corporation.
   Copyright (C) 1998-2003 Hallvard B. Furuseth.
   Copyright (C) 1992-1996 Regents of the University of Michigan.
+  Copyright (C) 2000 Dimitrios Souflis
 
   GnuPG is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
@@ -111,6 +112,39 @@ ADNS is
   Copyright (C) 1991 Massachusetts Institute of Technology
 
 
+TinySCHEME is part of the GnuPG package and is
+
+  Copyright (c) 2000, Dimitrios Souflis
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+
+  Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+  Neither the name of Dimitrios Souflis nor the names of the
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 SQLite has
 
   been put into the public-domain by its author D. Richard Hipp:
diff --git a/tests/gpgscm/COPYING b/tests/gpgscm/LICENSE.TinySCHEME
similarity index 100%
rename from tests/gpgscm/COPYING
rename to tests/gpgscm/LICENSE.TinySCHEME