--- a/licenses/README.txt	Mon Sep 29 16:08:38 2014 +0200
+++ b/licenses/README.txt	Mon Sep 29 16:12:47 2014 +0200
@@ -54,36 +54,100 @@
 
     - Oxygen-Icons
       URL: http://www.oxygen-icons.org
-      Lizenz: GNU LGPL v>=3
-
-    - OpenSSL-based signcode utility
-      URL: http://osslsigncode.sourceforge.net
-      License: GPL v==3
-
-    - OpenSSL
-      URL: https://www.openssl.org
-      License: OpenSSL License
+      License: GNU LGPL v>=3
 
     - NSIS
       URL: http://nsis.sourceforge.net
       License: zlib/libpng license and Common Public License version 1.0
       (only LZMA compression module)
-  
 
+TrustBridge Administrator can utilse a code signing tool, thus it comes
+bundled with osslsigncode, which itself depends on OpenSSL:
+
+    - OpenSSL-based signcode utility
+      URL: http://osslsigncode.sourceforge.net
+      License: GNU GPL v==3 + OpenSSL exception.
+
+    - OpenSSL
+      URL: https://www.openssl.org
+      License: OpenSSL License
+
+
+Scripts and tools for building and testing the TrustBridge binaries 
+are Free Software as well. Most can be downloaded in binary and source 
+from Ubuntu or Debian, see the details in INSTALL, except:j
+
+    - Hiawatha
+      URL: https://www.hiawatha-webserver.org
+      License: GNU GPL v==2
 --------------------------------------------------------------
-License texts of all used components in detail:
+
+Licenses in detail:
+===================
 
 
 Qt
 ==
-    License: GNU LGPL v==2 or GNU GPL v==3
-    (see LGPLv2.txt or GPLv3.txt)
+ Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ Contact: http://www.qt-project.org/legal
+
+ $QT_BEGIN_LICENSE:LGPL$
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Digia.  For licensing terms and
+ conditions see http://qt.digia.com/licensing.  For further information
+ use the contact form at http://qt.digia.com/contact-us.
+
+ GNU Lesser General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU Lesser
+ General Public License version 2.1 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPL included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU Lesser General Public License version 2.1 requirements
+ will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+
+ In addition, as a special exception, Digia gives you certain additional
+ rights.  These rights are described in the Digia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+
+ GNU General Public License Usage
+ Alternatively, this file may be used under the terms of the GNU
+ General Public License version 3.0 as published by the Free Software
+ Foundation and appearing in the file LICENSE.GPL included in the
+ packaging of this file.  Please review the following information to
+ ensure the GNU General Public License version 3.0 requirements will be
+ met: http://www.gnu.org/copyleft/gpl.html.
+ $QT_END_LICENSE$
+
+(see LGPLv2.txt or GPLv3.txt)
 
 
 PolarSSL
 ========
-    License: GPL v>=2
-    (see GPLv2.txt)
+  Copyright (C) 2006-2014, Brainspark B.V.
+
+  This file is part of PolarSSL (http://www.polarssl.org)
+  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
+
+  All rights reserved.
+
+  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; either version 2 of the License, or
+  (at your option) any later version.
+
+  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, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+(see GPLv2.txt)
 
 
 Oxygen-Icons
@@ -139,13 +203,22 @@
   kde-artists [at] kde.org
 
 -----
-(jsee LGPLv3.txt)
+(see LGPLv3.txt)
 
 
 Mozilla NSS
 ===========
-    Lizenz: Mozilla Public License v2
-    (see MPLv2.txt)
+The Mozilla Project.
+
+The NSS library is licensed under the terms of the Mozilla Public License
+version 1.1 or, at your option, under the terms of the GNU General Public
+License version 2 or subsequent, or the terms of the GNU Lesser General
+Public License version 2.1 or subsequent.
+
+The original code is copyright (c) 1994-2000 Netscape Communications
+Corporation.
+
+(see MPLv2.txt)
 
 
 libcurl
@@ -180,8 +253,37 @@
 
 OpenSSL-based signcode utility
 ==============================
-    License: GPL v==3
-    (see GPLv3.txt)
+   OpenSSL based Authenticode signing for PE/MSI/Java CAB files.
+
+	 Copyright (C) 2005-2014 Per Allansson <pallansson@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, either version 3 of the License, or
+   (at your option) any later version.
+
+   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 <http://www.gnu.org/licenses/>.
+
+   In addition, as a special exception, the copyright holders give
+   permission to link the code of portions of this program with the
+   OpenSSL library under certain conditions as described in each
+   individual source file, and distribute linked combinations
+   including the two.
+   You must obey the GNU General Public License in all respects
+   for all of the code used other than OpenSSL.  If you modify
+   file(s) with this exception, you may extend this exception to your
+   version of the file(s), but you are not obligated to do so.  If you
+   do not wish to do so, delete this exception statement from your
+   version.  If you delete this exception statement from all source
+   files in the program, then also delete it here.
+(see GPLv3.txt)
 
 
 OpenSSL
@@ -490,3 +592,17 @@
     additions to files from the LZMA compression module for NSIS, however,
     are subject to the terms of the Common Public License version 1.0.
 
+Hiawatha
+========
+Copyright © by Hugo Leisink.
+
+ 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 of the License. For a copy,
+ see http://www.gnu.org/licenses/gpl-2.0.html.
+
+ 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.
+(see GPLv2.txt)