diff --git a/MSIBuild/Makefile b/MSIBuild/Makefile
index 03d8290..a9aa5aa 100644
--- a/MSIBuild/Makefile
+++ b/MSIBuild/Makefile
@@ -1,5 +1,6 @@
 #
 #    Copyright 1991-2016 Amebis
+#    Copyright 2016 GÉANT
 #
 #    This file is part of ZRCola.
 #
diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h
index b6ebd27..c365e84 100644
--- a/include/wxex/appbar.h
+++ b/include/wxex/appbar.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
     Based on code written by Jeffrey Richter.
 
     This file is part of wxExtend.
diff --git a/include/wxex/common.h b/include/wxex/common.h
index d646654..1eaa003 100644
--- a/include/wxex/common.h
+++ b/include/wxex/common.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/comutils.h b/include/wxex/comutils.h
index 8728af5..60ae95c 100644
--- a/include/wxex/comutils.h
+++ b/include/wxex/comutils.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/crypto.h b/include/wxex/crypto.h
index a272b15..aa65dd6 100644
--- a/include/wxex/crypto.h
+++ b/include/wxex/crypto.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/hex.h b/include/wxex/hex.h
index 15ccb40..efa98a3 100644
--- a/include/wxex/hex.h
+++ b/include/wxex/hex.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/object.h b/include/wxex/object.h
index a37dbbb..2e5fd6f 100644
--- a/include/wxex/object.h
+++ b/include/wxex/object.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/persist/auimanager.h b/include/wxex/persist/auimanager.h
index 6eb1054..d48c353 100644
--- a/include/wxex/persist/auimanager.h
+++ b/include/wxex/persist/auimanager.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/persist/dialog.h b/include/wxex/persist/dialog.h
index 12d0f8f..530e54c 100644
--- a/include/wxex/persist/dialog.h
+++ b/include/wxex/persist/dialog.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/url.h b/include/wxex/url.h
index 699e360..01e1f9f 100644
--- a/include/wxex/url.h
+++ b/include/wxex/url.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/valhex.h b/include/wxex/valhex.h
index 8088b51..a98aff5 100644
--- a/include/wxex/valhex.h
+++ b/include/wxex/valhex.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/valnet.h b/include/wxex/valnet.h
index 0377be1..1b62163 100644
--- a/include/wxex/valnet.h
+++ b/include/wxex/valnet.h
@@ -1,5 +1,6 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/include/wxex/xml.h b/include/wxex/xml.h
index d638412..fdbabad 100644
--- a/include/wxex/xml.h
+++ b/include/wxex/xml.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/appbar.cpp b/src/appbar.cpp
index 1276d6f..a8f0d97 100644
--- a/src/appbar.cpp
+++ b/src/appbar.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
     Based on code written by Jeffrey Richter.
 
     This file is part of wxExtend.
diff --git a/src/comutils.cpp b/src/comutils.cpp
index 09d1379..d5e0b44 100644
--- a/src/comutils.cpp
+++ b/src/comutils.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 63d9c05..3790f8e 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/hex.cpp b/src/hex.cpp
index 837f321..38eb755 100644
--- a/src/hex.cpp
+++ b/src/hex.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/stdafx.cpp b/src/stdafx.cpp
index 2771d46..6d5672d 100644
--- a/src/stdafx.cpp
+++ b/src/stdafx.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/stdafx.h b/src/stdafx.h
index 8e264b3..57dc5d5 100644
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/url.cpp b/src/url.cpp
index d1f9baf..e5811a3 100644
--- a/src/url.cpp
+++ b/src/url.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/valhex.cpp b/src/valhex.cpp
index 5bf25b1..d953c97 100644
--- a/src/valhex.cpp
+++ b/src/valhex.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/valnet.cpp b/src/valnet.cpp
index 9ee80ec..5ea5b31 100644
--- a/src/valnet.cpp
+++ b/src/valnet.cpp
@@ -1,5 +1,6 @@
 /*
-    Copyright 2015-2016 Amebis
+    Copyright 2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.
 
diff --git a/src/xml.cpp b/src/xml.cpp
index 26b039f..50518dc 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -1,5 +1,6 @@
 /*
     Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
 
     This file is part of wxExtend.