diff --git a/lang/cpp/Makefile.am b/lang/cpp/Makefile.am
index 7fbaca8e..026ca008 100644
--- a/lang/cpp/Makefile.am
+++ b/lang/cpp/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile.am for GPGMEPP.
-# Copyright (C) 2016 Intevation GmbH
+# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
+# Software engineering by Intevation GmbH
 #
 # This file is part of GPGMEPP.
 #
diff --git a/lang/cpp/src/Makefile.am b/lang/cpp/src/Makefile.am
index 4028b3d5..1e6bdc28 100644
--- a/lang/cpp/src/Makefile.am
+++ b/lang/cpp/src/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile.am for GPGMEPP.
-# Copyright (C) 2016 Intevation GmbH
+# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
+# Software engineering by Intevation GmbH
 #
 # This file is part of GPGMEPP.
 #
diff --git a/lang/cpp/src/callbacks.cpp b/lang/cpp/src/callbacks.cpp
index 3631c537..f7692a03 100644
--- a/lang/cpp/src/callbacks.cpp
+++ b/lang/cpp/src/callbacks.cpp
@@ -1,6 +1,8 @@
 /*
   callbacks.cpp - callback targets for internal use:
   Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/callbacks.h b/lang/cpp/src/callbacks.h
index 42066379..a2c6e1b9 100644
--- a/lang/cpp/src/callbacks.h
+++ b/lang/cpp/src/callbacks.h
@@ -1,6 +1,8 @@
 /*
   callbacks.h - callback targets for internal use:
   Copyright (C) 2003 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/configuration.cpp b/lang/cpp/src/configuration.cpp
index 293746ae..8ccc05e9 100644
--- a/lang/cpp/src/configuration.cpp
+++ b/lang/cpp/src/configuration.cpp
@@ -1,6 +1,8 @@
 /*
   configuration.cpp - wraps gpgme configuration components
   Copyright (C) 2010 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/configuration.h b/lang/cpp/src/configuration.h
index 288a410d..6717ea3e 100644
--- a/lang/cpp/src/configuration.h
+++ b/lang/cpp/src/configuration.h
@@ -1,6 +1,8 @@
 /*
   configuration.h - wraps gpgme configuration components
   Copyright (C) 2010 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/context_glib.cpp b/lang/cpp/src/context_glib.cpp
index 14093bf2..db607aac 100644
--- a/lang/cpp/src/context_glib.cpp
+++ b/lang/cpp/src/context_glib.cpp
@@ -1,6 +1,8 @@
 /*
   context_glib.cpp - wraps a gpgme key context, gpgme-glib-specific functions
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/context_p.h b/lang/cpp/src/context_p.h
index d53da0ac..6b0a0805 100644
--- a/lang/cpp/src/context_p.h
+++ b/lang/cpp/src/context_p.h
@@ -1,6 +1,8 @@
 /*
   context_p.h - wraps a gpgme context (private part)
   Copyright (C) 2003, 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/context_qt.cpp b/lang/cpp/src/context_qt.cpp
index 5d716c5d..e6d1f029 100644
--- a/lang/cpp/src/context_qt.cpp
+++ b/lang/cpp/src/context_qt.cpp
@@ -1,6 +1,8 @@
 /*
   context_qt.cpp - wraps a gpgme key context, gpgme-qt-specific functions
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/context_vanilla.cpp b/lang/cpp/src/context_vanilla.cpp
index 77a488ae..60ddea20 100644
--- a/lang/cpp/src/context_vanilla.cpp
+++ b/lang/cpp/src/context_vanilla.cpp
@@ -1,6 +1,8 @@
 /*
   context_vanilla.cpp - wraps a gpgme key context, gpgme (vanilla)-specific functions
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/data_p.h b/lang/cpp/src/data_p.h
index 38ba55af..493b7542 100644
--- a/lang/cpp/src/data_p.h
+++ b/lang/cpp/src/data_p.h
@@ -1,6 +1,8 @@
 /*
   data_p.h - wraps a gpgme data object, private part -*- c++ -*-
   Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/decryptionresult.cpp b/lang/cpp/src/decryptionresult.cpp
index f59d24ca..05f7e754 100644
--- a/lang/cpp/src/decryptionresult.cpp
+++ b/lang/cpp/src/decryptionresult.cpp
@@ -1,6 +1,8 @@
 /*
   decryptionresult.cpp - wraps a gpgme keygen result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/decryptionresult.h b/lang/cpp/src/decryptionresult.h
index 60b78d9c..cd3ab7c4 100644
--- a/lang/cpp/src/decryptionresult.h
+++ b/lang/cpp/src/decryptionresult.h
@@ -1,6 +1,8 @@
 /*
   decryptionresult.h - wraps a gpgme keygen result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/defaultassuantransaction.cpp b/lang/cpp/src/defaultassuantransaction.cpp
index 549092d2..2184f043 100644
--- a/lang/cpp/src/defaultassuantransaction.cpp
+++ b/lang/cpp/src/defaultassuantransaction.cpp
@@ -1,6 +1,8 @@
 /*
   defaultassuantransaction.cpp - default Assuan Transaction that just stores data and status lines
   Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/defaultassuantransaction.h b/lang/cpp/src/defaultassuantransaction.h
index bf4b8395..f294ffe2 100644
--- a/lang/cpp/src/defaultassuantransaction.h
+++ b/lang/cpp/src/defaultassuantransaction.h
@@ -1,6 +1,8 @@
 /*
   defaultassuantransaction.h - default Assuan Transaction that just stores data and status lines
   Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/editinteractor.cpp b/lang/cpp/src/editinteractor.cpp
index b652bdaf..3e294889 100644
--- a/lang/cpp/src/editinteractor.cpp
+++ b/lang/cpp/src/editinteractor.cpp
@@ -1,6 +1,8 @@
 /*
   editinteractor.cpp - Interface for edit interactors
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/editinteractor.h b/lang/cpp/src/editinteractor.h
index 21220528..247bf8c0 100644
--- a/lang/cpp/src/editinteractor.h
+++ b/lang/cpp/src/editinteractor.h
@@ -1,6 +1,8 @@
 /*
   editinteractor.h - Interface for edit interactors
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/encryptionresult.cpp b/lang/cpp/src/encryptionresult.cpp
index b4298d77..33365cd4 100644
--- a/lang/cpp/src/encryptionresult.cpp
+++ b/lang/cpp/src/encryptionresult.cpp
@@ -1,6 +1,8 @@
 /*
   encryptionresult.cpp - wraps a gpgme verify result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/encryptionresult.h b/lang/cpp/src/encryptionresult.h
index edc400fb..312dfec7 100644
--- a/lang/cpp/src/encryptionresult.h
+++ b/lang/cpp/src/encryptionresult.h
@@ -1,6 +1,8 @@
 /*
   encryptionresult.h - wraps a gpgme sign result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/engineinfo.cpp b/lang/cpp/src/engineinfo.cpp
index 763aab9e..1a66ced2 100644
--- a/lang/cpp/src/engineinfo.cpp
+++ b/lang/cpp/src/engineinfo.cpp
@@ -1,6 +1,8 @@
 /*
   engineinfo.h
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/engineinfo.h b/lang/cpp/src/engineinfo.h
index aa6fccaf..b216de80 100644
--- a/lang/cpp/src/engineinfo.h
+++ b/lang/cpp/src/engineinfo.h
@@ -1,6 +1,8 @@
 /*
   engineinfo.h
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/error.h b/lang/cpp/src/error.h
index 009fe20f..d1367046 100644
--- a/lang/cpp/src/error.h
+++ b/lang/cpp/src/error.h
@@ -1,6 +1,8 @@
 /*
   error.h - wraps a gpgme error
   Copyright (C) 2003, 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/eventloopinteractor.cpp b/lang/cpp/src/eventloopinteractor.cpp
index 7faa50c0..a30b793c 100644
--- a/lang/cpp/src/eventloopinteractor.cpp
+++ b/lang/cpp/src/eventloopinteractor.cpp
@@ -1,6 +1,8 @@
 /*
   eventloopinteractor.cpp
   Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/eventloopinteractor.h b/lang/cpp/src/eventloopinteractor.h
index 94821d6d..79f6b632 100644
--- a/lang/cpp/src/eventloopinteractor.h
+++ b/lang/cpp/src/eventloopinteractor.h
@@ -1,6 +1,8 @@
 /*
   eventloopinteractor.h
   Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/exception.cpp b/lang/cpp/src/exception.cpp
index cf42f916..7751c3ea 100644
--- a/lang/cpp/src/exception.cpp
+++ b/lang/cpp/src/exception.cpp
@@ -1,6 +1,8 @@
 /*
   exception.cpp - exception wrapping a gpgme error
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/exception.h b/lang/cpp/src/exception.h
index 8f40b0e0..85169d83 100644
--- a/lang/cpp/src/exception.h
+++ b/lang/cpp/src/exception.h
@@ -1,6 +1,8 @@
 /*
   exception.h - exception wrapping a gpgme error
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/global.h b/lang/cpp/src/global.h
index 15cc027c..38cfd4ca 100644
--- a/lang/cpp/src/global.h
+++ b/lang/cpp/src/global.h
@@ -1,6 +1,8 @@
 /*
   global.h - global gpgme functions and enums
   Copyright (C) 2003, 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgadduserideditinteractor.cpp b/lang/cpp/src/gpgadduserideditinteractor.cpp
index f7851a56..593ac58e 100644
--- a/lang/cpp/src/gpgadduserideditinteractor.cpp
+++ b/lang/cpp/src/gpgadduserideditinteractor.cpp
@@ -1,6 +1,8 @@
 /*
   gpgadduserideditinteractor.cpp - Edit Interactor to add a new UID to an OpenPGP key
   Copyright (C) 2008 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgadduserideditinteractor.h b/lang/cpp/src/gpgadduserideditinteractor.h
index 12b6e46a..10cac08d 100644
--- a/lang/cpp/src/gpgadduserideditinteractor.h
+++ b/lang/cpp/src/gpgadduserideditinteractor.h
@@ -1,6 +1,8 @@
 /*
   gpgadduserideditinteractor.h - Edit Interactor to add a new UID to an OpenPGP key
   Copyright (C) 2008 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
index 4b30b31f..a05ff96f 100644
--- a/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
+++ b/lang/cpp/src/gpgagentgetinfoassuantransaction.cpp
@@ -1,6 +1,8 @@
 /*
   gpgagentgetinfoassuantransaction.cpp - Assuan Transaction to get information from gpg-agent
   Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgagentgetinfoassuantransaction.h b/lang/cpp/src/gpgagentgetinfoassuantransaction.h
index 9e3e9581..1bc50161 100644
--- a/lang/cpp/src/gpgagentgetinfoassuantransaction.h
+++ b/lang/cpp/src/gpgagentgetinfoassuantransaction.h
@@ -1,6 +1,8 @@
 /*
   gpgagentgetinfoassuantransaction.h - Assuan Transaction to get information from gpg-agent
   Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgmefw.h b/lang/cpp/src/gpgmefw.h
index e3c9b184..fdad7bf0 100644
--- a/lang/cpp/src/gpgmefw.h
+++ b/lang/cpp/src/gpgmefw.h
@@ -1,6 +1,8 @@
 /*
   gpgmefw.h - Forwards declarations for gpgme (0.3 and 0.4)
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
index 5e8ba80e..7aebe73a 100644
--- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
+++ b/lang/cpp/src/gpgsetexpirytimeeditinteractor.cpp
@@ -1,6 +1,8 @@
 /*
   gpgsetexpirytimeeditinteractor.cpp - Edit Interactor to change the expiry time of an OpenPGP key
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgsetexpirytimeeditinteractor.h b/lang/cpp/src/gpgsetexpirytimeeditinteractor.h
index 670b4459..6a4c7373 100644
--- a/lang/cpp/src/gpgsetexpirytimeeditinteractor.h
+++ b/lang/cpp/src/gpgsetexpirytimeeditinteractor.h
@@ -1,6 +1,8 @@
 /*
   gpgsetexpirytimeeditinteractor.h - Edit Interactor to change the expiry time of an OpenPGP key
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
index 581605ff..7525fd82 100644
--- a/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
+++ b/lang/cpp/src/gpgsetownertrusteditinteractor.cpp
@@ -1,6 +1,8 @@
 /*
   gpgsetownertrusteditinteractor.cpp - Edit Interactor to change the expiry time of an OpenPGP key
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgsetownertrusteditinteractor.h b/lang/cpp/src/gpgsetownertrusteditinteractor.h
index caf29eed..9cec77e7 100644
--- a/lang/cpp/src/gpgsetownertrusteditinteractor.h
+++ b/lang/cpp/src/gpgsetownertrusteditinteractor.h
@@ -1,6 +1,8 @@
 /*
   gpgsetownertrusteditinteractor.h - Edit Interactor to change the owner trust of an OpenPGP key
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.cpp b/lang/cpp/src/gpgsignkeyeditinteractor.cpp
index 7effc641..4c6c87c1 100644
--- a/lang/cpp/src/gpgsignkeyeditinteractor.cpp
+++ b/lang/cpp/src/gpgsignkeyeditinteractor.cpp
@@ -1,6 +1,8 @@
 /*
   gpgsignkeyeditinteractor.cpp - Edit Interactor to change the expiry time of an OpenPGP key
   Copyright (C) 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/gpgsignkeyeditinteractor.h b/lang/cpp/src/gpgsignkeyeditinteractor.h
index 47ff8e55..f6cb4737 100644
--- a/lang/cpp/src/gpgsignkeyeditinteractor.h
+++ b/lang/cpp/src/gpgsignkeyeditinteractor.h
@@ -1,6 +1,8 @@
 /*
   gpgsignkeyeditinteractor.h - Edit Interactor to change the owner trust of an OpenPGP key
   Copyright (C) 2008 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/importresult.cpp b/lang/cpp/src/importresult.cpp
index 4329fc08..8c35f9cc 100644
--- a/lang/cpp/src/importresult.cpp
+++ b/lang/cpp/src/importresult.cpp
@@ -1,6 +1,8 @@
 /*
   importresult.cpp - wraps a gpgme import result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/importresult.h b/lang/cpp/src/importresult.h
index adda80a4..2f0e7f20 100644
--- a/lang/cpp/src/importresult.h
+++ b/lang/cpp/src/importresult.h
@@ -1,6 +1,8 @@
 /*
   importresult.h - wraps a gpgme import result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/interfaces/assuantransaction.h b/lang/cpp/src/interfaces/assuantransaction.h
index a382b058..0d0dcccb 100644
--- a/lang/cpp/src/interfaces/assuantransaction.h
+++ b/lang/cpp/src/interfaces/assuantransaction.h
@@ -1,6 +1,8 @@
 /*
   assuantransaction.h - Interface for ASSUAN transactions
-  Copyright (C) 2009 Klarälvdalens Datakonsult AB <info@kdab.com>
+  Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH <info@kdab.com>
   Author: Marc Mutz <marc@kdab.com>
 
   This file is part of GPGME++.
diff --git a/lang/cpp/src/interfaces/dataprovider.h b/lang/cpp/src/interfaces/dataprovider.h
index 166bb4ec..c8f387d6 100644
--- a/lang/cpp/src/interfaces/dataprovider.h
+++ b/lang/cpp/src/interfaces/dataprovider.h
@@ -1,6 +1,8 @@
 /*
   interface/dataprovider.h - Interface for data sources
   Copyright (C) 2003 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/interfaces/passphraseprovider.h b/lang/cpp/src/interfaces/passphraseprovider.h
index 5275e44b..c97aa542 100644
--- a/lang/cpp/src/interfaces/passphraseprovider.h
+++ b/lang/cpp/src/interfaces/passphraseprovider.h
@@ -1,6 +1,8 @@
 /*
   interface/passphraseprovider.h - Interface for passphrase callbacks
   Copyright (C) 2003,2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/interfaces/progressprovider.h b/lang/cpp/src/interfaces/progressprovider.h
index 78bbdd78..ef4ca3cf 100644
--- a/lang/cpp/src/interfaces/progressprovider.h
+++ b/lang/cpp/src/interfaces/progressprovider.h
@@ -1,6 +1,8 @@
 /*
   interface/progressprovider.h - Interface for progress reports
   Copyright (C) 2003 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/keygenerationresult.cpp b/lang/cpp/src/keygenerationresult.cpp
index 52d52224..ebbb3b99 100644
--- a/lang/cpp/src/keygenerationresult.cpp
+++ b/lang/cpp/src/keygenerationresult.cpp
@@ -1,6 +1,8 @@
 /*
   keygenerationresult.cpp - wraps a gpgme keygen result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/keygenerationresult.h b/lang/cpp/src/keygenerationresult.h
index c35c5044..a92151b4 100644
--- a/lang/cpp/src/keygenerationresult.h
+++ b/lang/cpp/src/keygenerationresult.h
@@ -1,6 +1,8 @@
 /*
   keygenerationresult.h - wraps a gpgme keygen result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/keylistresult.cpp b/lang/cpp/src/keylistresult.cpp
index e6fb77fb..6e6b001b 100644
--- a/lang/cpp/src/keylistresult.cpp
+++ b/lang/cpp/src/keylistresult.cpp
@@ -1,6 +1,8 @@
 /*
   keylistresult.cpp - wraps a gpgme keylist result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/keylistresult.h b/lang/cpp/src/keylistresult.h
index 7dfe2d71..d0a86900 100644
--- a/lang/cpp/src/keylistresult.h
+++ b/lang/cpp/src/keylistresult.h
@@ -1,6 +1,8 @@
 /*
   keylistresult.h - wraps a gpgme keylist result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/notation.h b/lang/cpp/src/notation.h
index 807bdaad..5b89214c 100644
--- a/lang/cpp/src/notation.h
+++ b/lang/cpp/src/notation.h
@@ -1,6 +1,8 @@
 /*
   notation.h - wraps a gpgme verify result
   Copyright (C) 2004, 2007 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/result.h b/lang/cpp/src/result.h
index a86d81f0..5ed52a89 100644
--- a/lang/cpp/src/result.h
+++ b/lang/cpp/src/result.h
@@ -1,6 +1,8 @@
 /*
   result.h - base class for results
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/result_p.h b/lang/cpp/src/result_p.h
index 0cf73e42..70c45c47 100644
--- a/lang/cpp/src/result_p.h
+++ b/lang/cpp/src/result_p.h
@@ -1,6 +1,8 @@
 /*
   result.h - base class for results
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/scdgetinfoassuantransaction.cpp b/lang/cpp/src/scdgetinfoassuantransaction.cpp
index fb59bccb..c2fbeed0 100644
--- a/lang/cpp/src/scdgetinfoassuantransaction.cpp
+++ b/lang/cpp/src/scdgetinfoassuantransaction.cpp
@@ -1,6 +1,8 @@
 /*
   scdgetinfoassuantransaction.cpp - Assuan Transaction to get information from scdaemon
   Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/scdgetinfoassuantransaction.h b/lang/cpp/src/scdgetinfoassuantransaction.h
index a22a0ffd..ef805303 100644
--- a/lang/cpp/src/scdgetinfoassuantransaction.h
+++ b/lang/cpp/src/scdgetinfoassuantransaction.h
@@ -1,6 +1,8 @@
 /*
   scdgetinfoassuantransaction.h - Assuan Transaction to get information from scdaemon
   Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/signingresult.cpp b/lang/cpp/src/signingresult.cpp
index 3252c035..6a5231ff 100644
--- a/lang/cpp/src/signingresult.cpp
+++ b/lang/cpp/src/signingresult.cpp
@@ -1,6 +1,8 @@
 /*
   signingresult.cpp - wraps a gpgme verify result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/signingresult.h b/lang/cpp/src/signingresult.h
index 2c274549..c6654fca 100644
--- a/lang/cpp/src/signingresult.h
+++ b/lang/cpp/src/signingresult.h
@@ -1,6 +1,8 @@
 /*
   signingresult.h - wraps a gpgme sign result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/trustitem.cpp b/lang/cpp/src/trustitem.cpp
index 05650306..c29c0f41 100644
--- a/lang/cpp/src/trustitem.cpp
+++ b/lang/cpp/src/trustitem.cpp
@@ -1,6 +1,8 @@
 /*
   trustitem.cpp - wraps a gpgme trust item
   Copyright (C) 2003 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME.
 
diff --git a/lang/cpp/src/trustitem.h b/lang/cpp/src/trustitem.h
index 65f109c8..ad2a4a61 100644
--- a/lang/cpp/src/trustitem.h
+++ b/lang/cpp/src/trustitem.h
@@ -1,6 +1,8 @@
 /*
   trustitem.h - wraps a gpgme trust item
   Copyright (C) 2003 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME.
 
diff --git a/lang/cpp/src/util.h b/lang/cpp/src/util.h
index b0d47e3e..4495cc02 100644
--- a/lang/cpp/src/util.h
+++ b/lang/cpp/src/util.h
@@ -1,6 +1,8 @@
 /*
   util.h - some inline helper functions
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
index 42e483c4..8d90a7db 100644
--- a/lang/cpp/src/verificationresult.cpp
+++ b/lang/cpp/src/verificationresult.cpp
@@ -1,6 +1,8 @@
 /*
   verificationresult.cpp - wraps a gpgme verify result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/verificationresult.h b/lang/cpp/src/verificationresult.h
index b6d1d8ce..765fb79d 100644
--- a/lang/cpp/src/verificationresult.h
+++ b/lang/cpp/src/verificationresult.h
@@ -1,6 +1,8 @@
 /*
   verificationresult.h - wraps a gpgme verify result
   Copyright (C) 2004 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH
 
   This file is part of GPGME++.
 
diff --git a/lang/cpp/src/vfsmountresult.cpp b/lang/cpp/src/vfsmountresult.cpp
index d3607d1b..60faa385 100644
--- a/lang/cpp/src/vfsmountresult.cpp
+++ b/lang/cpp/src/vfsmountresult.cpp
@@ -1,6 +1,8 @@
 /*
   vfsmountresult.cpp - wraps a gpgme vfs mount result
-  Copyright (C) 2009 Klarälvdalens Datakonsult AB <info@kdab.com>
+  Copyright (C) 2009 Klarälvdalens Datakonsult AB
+  2016 Bundesamt für Sicherheit in der Informationstechnik
+  Software engineering by Intevation GmbH <info@kdab.com>
   Author: Marc Mutz <marc@kdab.com>, Volker Krause <volker@kdab.com>
 
   This file is part of GPGME++.
diff --git a/lang/qt/Makefile.am b/lang/qt/Makefile.am
index 39eb55ee..ab859609 100644
--- a/lang/qt/Makefile.am
+++ b/lang/qt/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile.am for GPGMEPP.
-# Copyright (C) 2016 Intevation GmbH
+# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
+# Software engineering by Intevation GmbH
 #
 # This file is part of GPGMEPP.
 #
diff --git a/lang/qt/doc/Makefile.am b/lang/qt/doc/Makefile.am
index ddf49351..fd57cc85 100644
--- a/lang/qt/doc/Makefile.am
+++ b/lang/qt/doc/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile.am - Makefile for GPGME Qt docs.
-# Copyright (C) 2016 Intevation GmbH
+# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
+# Software engineering by Intevation GmbH
 #
 # This file is part of GPGME.
 #
diff --git a/lang/qt/src/Makefile.am b/lang/qt/src/Makefile.am
index c81461ee..3b3cffc4 100644
--- a/lang/qt/src/Makefile.am
+++ b/lang/qt/src/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile.am for GPGMEPP.
-# Copyright (C) 2016 Intevation GmbH
+# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
+# Software engineering by Intevation GmbH
 #
 # This file is part of GPGMEPP.
 #
diff --git a/lang/qt/src/defaultkeygenerationjob.h b/lang/qt/src/defaultkeygenerationjob.h
index 5b7334c4..fcefc4b9 100644
--- a/lang/qt/src/defaultkeygenerationjob.h
+++ b/lang/qt/src/defaultkeygenerationjob.h
@@ -1,6 +1,8 @@
 /* defaultkeygenerationjob.h
 
     Copyright (c) 2016 Klarälvdalens Datakonsult AB
+    2016 Bundesamt für Sicherheit in der Informationstechnik
+    Software engineering by Intevation GmbH
 
     QGpgME is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
diff --git a/lang/qt/tests/Makefile.am b/lang/qt/tests/Makefile.am
index fb45eec0..ccad8c23 100644
--- a/lang/qt/tests/Makefile.am
+++ b/lang/qt/tests/Makefile.am
@@ -1,5 +1,6 @@
 # Makefile.am - Makefile for GPGME Qt tests.
-# Copyright (C) 2016 Intevation GmbH
+# Copyright (C) 2016 Bundesamt für Sicherheit in der Informationstechnik
+# Software engineering by Intevation GmbH
 #
 # This file is part of GPGME.
 #