diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a0755c0..4d14ce1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/COPYING b/COPYING
index f8bbd88f..9419b41a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,5 +1,7 @@
 synergy -- mouse and keyboard sharing utility
-Copyright (C) 2012 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+Copyright (C) 2012 Bolton Software Ltd.
+Copyright (C) 2008-2012 Nick Bolton
+Copyright (C) 2002-2012 Chris Schoeneman
 
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
diff --git a/hm.py b/hm.py
index 0bce7a82..8401f5d1 100644
--- a/hm.py
+++ b/hm.py
@@ -1,7 +1,8 @@
 #! /usr/bin/env python
 
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3988d19a..c10dca62 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2011 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 11c2692b..9e9cedd5 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2011 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
index f825b585..92075dd2 100644
--- a/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h b/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
index 3619bb03..9b4b0834 100644
--- a/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/CMSWindowsClientTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index 357580b2..1015df59 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/COSXClientTaskBarReceiver.cpp b/src/cmd/synergyc/COSXClientTaskBarReceiver.cpp
index f0cfbca1..1ed759e3 100644
--- a/src/cmd/synergyc/COSXClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/COSXClientTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/COSXClientTaskBarReceiver.h b/src/cmd/synergyc/COSXClientTaskBarReceiver.h
index 147a6d9e..27784c75 100644
--- a/src/cmd/synergyc/COSXClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/COSXClientTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp b/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp
index 64f28a18..91c0f7a3 100644
--- a/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp
+++ b/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h b/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h
index 4cad4d0b..54ab5997 100644
--- a/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h
+++ b/src/cmd/synergyc/CXWindowsClientTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyc/synergyc.cpp b/src/cmd/synergyc/synergyc.cpp
index f7eb4b50..4cb7b20c 100644
--- a/src/cmd/synergyc/synergyc.cpp
+++ b/src/cmd/synergyc/synergyc.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/synergyd/CMakeLists.txt
index 3cb2410b..c7d66f07 100644
--- a/src/cmd/synergyd/CMakeLists.txt
+++ b/src/cmd/synergyd/CMakeLists.txt
@@ -1,4 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Bolton Software Ltd.
 # Copyright (C) 2012 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
diff --git a/src/cmd/synergyd/synergyd.cpp b/src/cmd/synergyd/synergyd.cpp
index 2ab2083e..d34929c3 100644
--- a/src/cmd/synergyd/synergyd.cpp
+++ b/src/cmd/synergyd/synergyd.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
index 5b2a5348..a2fb9589 100644
--- a/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h b/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h
index 7d8637b2..321b767b 100644
--- a/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h
+++ b/src/cmd/synergys/CMSWindowsServerTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt
index 3a6dcb97..1f442058 100644
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/COSXServerTaskBarReceiver.cpp b/src/cmd/synergys/COSXServerTaskBarReceiver.cpp
index 17d2a39a..aae65393 100644
--- a/src/cmd/synergys/COSXServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/COSXServerTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/COSXServerTaskBarReceiver.h b/src/cmd/synergys/COSXServerTaskBarReceiver.h
index 967f5b5c..d190f1af 100644
--- a/src/cmd/synergys/COSXServerTaskBarReceiver.h
+++ b/src/cmd/synergys/COSXServerTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp b/src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp
index 60a81eff..598555b9 100644
--- a/src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp
+++ b/src/cmd/synergys/CXWindowsServerTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/CXWindowsServerTaskBarReceiver.h b/src/cmd/synergys/CXWindowsServerTaskBarReceiver.h
index 1220bed1..0adc8124 100644
--- a/src/cmd/synergys/CXWindowsServerTaskBarReceiver.h
+++ b/src/cmd/synergys/CXWindowsServerTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/synergys/synergys.cpp b/src/cmd/synergys/synergys.cpp
index b56c19f1..1756e814 100644
--- a/src/cmd/synergys/synergys.cpp
+++ b/src/cmd/synergys/synergys.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/cmd/usynergy/CMakeLists.txt b/src/cmd/usynergy/CMakeLists.txt
index 08fd17e3..7db84d6a 100644
--- a/src/cmd/usynergy/CMakeLists.txt
+++ b/src/cmd/usynergy/CMakeLists.txt
@@ -1,4 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Bolton Software Ltd.
 # Copyright (C) 2012 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
diff --git a/src/gui/gui.ts b/src/gui/gui.ts
index 977d17e0..45a1af16 100644
--- a/src/gui/gui.ts
+++ b/src/gui/gui.ts
@@ -12,26 +12,36 @@
         <location filename="res/AboutDialogBase.ui" line="53"/>
         <source>&lt;p&gt;
 Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
-Copyright © 2001-2012 Chris Schoeneman, Nick Bolton, Volker Lanz, Sorin Sbarnea.&lt;br /&gt;&lt;br /&gt;
+Copyright © 2012 Bolton Software Ltd.&lt;br /&gt;
+Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
 Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
 Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
 The Synergy GUI is based on QSynergy by Volker Lanz.&lt;br /&gt;&lt;br /&gt;
 Visit our website for help and info (synergy-foss.org).
 &lt;/p&gt;</source>
+        <oldsource>&lt;p&gt;
+Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
+Copyright © 2012 Bolton Software Ltd.&lt;br /&gt;
+Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
+Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
+Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
+The Synergy GUI is based on QSynergy by Volker Lanz.&lt;br /&gt;&lt;br /&gt;
+Visit our website for help and info (synergy-foss.org).
+&lt;/p&gt;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="res/AboutDialogBase.ui" line="139"/>
+        <location filename="res/AboutDialogBase.ui" line="140"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="res/AboutDialogBase.ui" line="123"/>
+        <location filename="res/AboutDialogBase.ui" line="124"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="res/AboutDialogBase.ui" line="162"/>
+        <location filename="res/AboutDialogBase.ui" line="163"/>
         <source>&amp;Ok</source>
         <translation type="unfinished"></translation>
     </message>
@@ -150,169 +160,169 @@ Visit our website for help and info (synergy-foss.org).
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="src/MainWindow.cpp" line="625"/>
+        <location filename="src/MainWindow.cpp" line="626"/>
         <source>&amp;Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="195"/>
+        <location filename="src/MainWindow.cpp" line="196"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="196"/>
+        <location filename="src/MainWindow.cpp" line="197"/>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="197"/>
+        <location filename="src/MainWindow.cpp" line="198"/>
         <source>&amp;Window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="198"/>
+        <location filename="src/MainWindow.cpp" line="199"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="315"/>
+        <location filename="src/MainWindow.cpp" line="316"/>
         <source>&lt;p&gt;Version %1 is now available, &lt;a href=&quot;%2&quot;&gt;visit website&lt;/a&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="441"/>
+        <location filename="src/MainWindow.cpp" line="442"/>
         <source>Program can not be started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="441"/>
+        <location filename="src/MainWindow.cpp" line="442"/>
         <source>The executable&lt;br&gt;&lt;br&gt;%1&lt;br&gt;&lt;br&gt;could not be successfully started, although it does exist. Please check if you have sufficient permissions to run this program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="460"/>
+        <location filename="src/MainWindow.cpp" line="461"/>
         <source>Synergy client not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="461"/>
+        <location filename="src/MainWindow.cpp" line="462"/>
         <source>The executable for the synergy client does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="468"/>
+        <location filename="src/MainWindow.cpp" line="469"/>
         <source>Hostname is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="469"/>
+        <location filename="src/MainWindow.cpp" line="470"/>
         <source>Please fill in a hostname for the synergy client to connect to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="494"/>
+        <location filename="src/MainWindow.cpp" line="495"/>
         <source>Cannot write configuration file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="494"/>
+        <location filename="src/MainWindow.cpp" line="495"/>
         <source>The temporary configuration file required to start synergy can not be written.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="507"/>
+        <location filename="src/MainWindow.cpp" line="508"/>
         <source>Configuration filename invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="508"/>
+        <location filename="src/MainWindow.cpp" line="509"/>
         <source>You have not filled in a valid configuration file for the synergy server. Do you want to browse for the configuration file now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="535"/>
+        <location filename="src/MainWindow.cpp" line="536"/>
         <source>Synergy server not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="536"/>
+        <location filename="src/MainWindow.cpp" line="537"/>
         <source>The executable for the synergy server does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="600"/>
+        <location filename="src/MainWindow.cpp" line="601"/>
         <source>Synergy terminated with an error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="600"/>
+        <location filename="src/MainWindow.cpp" line="601"/>
         <source>Synergy terminated unexpectedly with an exit code of %1.&lt;br&gt;&lt;br&gt;Please see the log output for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="619"/>
+        <location filename="src/MainWindow.cpp" line="620"/>
         <source>&amp;Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="642"/>
+        <location filename="src/MainWindow.cpp" line="643"/>
         <source>service mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="642"/>
+        <location filename="src/MainWindow.cpp" line="643"/>
         <source>desktop mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="643"/>
+        <location filename="src/MainWindow.cpp" line="644"/>
         <source>Synergy is running (%1).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="786"/>
+        <location filename="src/MainWindow.cpp" line="787"/>
         <source>Elevate Synergy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="787"/>
+        <location filename="src/MainWindow.cpp" line="788"/>
         <source>Are you sure you want to elevate Synergy?
 
 This allows Synergy to interact with elevated processes and the UAC dialog, but can cause problems with non-elevated processes. Elevate Synergy only if you really need to.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="647"/>
+        <location filename="src/MainWindow.cpp" line="648"/>
         <source>Synergy is starting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="650"/>
+        <location filename="src/MainWindow.cpp" line="651"/>
         <source>Synergy is not running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="707"/>
+        <location filename="src/MainWindow.cpp" line="708"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="728"/>
+        <location filename="src/MainWindow.cpp" line="729"/>
         <source>Browse for a synergys config file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="741"/>
+        <location filename="src/MainWindow.cpp" line="742"/>
         <source>Save configuration as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="745"/>
+        <location filename="src/MainWindow.cpp" line="746"/>
         <source>Save failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="745"/>
+        <location filename="src/MainWindow.cpp" line="746"/>
         <source>Could not save configuration to file.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -515,7 +525,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but
 <context>
     <name>NewScreenWidget</name>
     <message>
-        <location filename="src/NewScreenWidget.cpp" line="31"/>
+        <location filename="src/NewScreenWidget.cpp" line="32"/>
         <source>Unnamed</source>
         <translation type="unfinished"></translation>
     </message>
@@ -523,17 +533,17 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but
 <context>
     <name>QObject</name>
     <message>
-        <location filename="src/MainWindow.cpp" line="44"/>
+        <location filename="src/MainWindow.cpp" line="45"/>
         <source>Synergy Configurations (*.sgc);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/MainWindow.cpp" line="47"/>
+        <location filename="src/MainWindow.cpp" line="48"/>
         <source>Synergy Configurations (*.conf);;All files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/main.cpp" line="95"/>
+        <location filename="src/main.cpp" line="96"/>
         <source>System tray is unavailable, quitting.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -541,12 +551,12 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but
 <context>
     <name>ScreenSettingsDialog</name>
     <message>
-        <location filename="src/ScreenSettingsDialog.cpp" line="64"/>
+        <location filename="src/ScreenSettingsDialog.cpp" line="65"/>
         <source>Screen name is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/ScreenSettingsDialog.cpp" line="64"/>
+        <location filename="src/ScreenSettingsDialog.cpp" line="65"/>
         <source>The name for a screen can not be empty. Please fill in a name or cancel the dialog.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -721,7 +731,7 @@ This allows Synergy to interact with elevated processes and the UAC dialog, but
 <context>
     <name>ScreenSetupModel</name>
     <message>
-        <location filename="src/ScreenSetupModel.cpp" line="50"/>
+        <location filename="src/ScreenSetupModel.cpp" line="51"/>
         <source>&lt;center&gt;Screen: &lt;b&gt;%1&lt;/b&gt;&lt;/center&gt;&lt;br&gt;Double click to edit settings&lt;br&gt;Drag screen to the trashcan to remove it</source>
         <translation type="unfinished"></translation>
     </message>
@@ -891,7 +901,7 @@ Double click on a screen to edit its settings.</source>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="src/SettingsDialog.cpp" line="71"/>
+        <location filename="src/SettingsDialog.cpp" line="72"/>
         <source>Save log file to...</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1017,12 +1027,12 @@ Double click on a screen to edit its settings.</source>
 <context>
     <name>SetupWizard</name>
     <message>
-        <location filename="src/SetupWizard.cpp" line="43"/>
+        <location filename="src/SetupWizard.cpp" line="60"/>
         <source>Setup Synergy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/SetupWizard.cpp" line="54"/>
+        <location filename="src/SetupWizard.cpp" line="71"/>
         <source>Please select an option.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1064,7 +1074,7 @@ Double click on a screen to edit its settings.</source>
 <context>
     <name>VersionChecker</name>
     <message>
-        <location filename="src/VersionChecker.cpp" line="101"/>
+        <location filename="src/VersionChecker.cpp" line="102"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/gui/res/AboutDialogBase.ui b/src/gui/res/AboutDialogBase.ui
index 65f141b6..063fd2cd 100644
--- a/src/gui/res/AboutDialogBase.ui
+++ b/src/gui/res/AboutDialogBase.ui
@@ -13,7 +13,7 @@
     <x>0</x>
     <y>0</y>
     <width>450</width>
-    <height>270</height>
+    <height>300</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -25,13 +25,13 @@
   <property name="minimumSize">
    <size>
     <width>450</width>
-    <height>270</height>
+    <height>300</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>450</width>
-    <height>270</height>
+    <height>300</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -52,7 +52,8 @@
      <property name="text">
       <string>&lt;p&gt;
 Keyboard and mouse sharing application. Cross platform and open source.&lt;br /&gt;&lt;br /&gt;
-Copyright © 2001-2012 Chris Schoeneman, Nick Bolton, Volker Lanz, Sorin Sbarnea.&lt;br /&gt;&lt;br /&gt;
+Copyright © 2012 Bolton Software Ltd.&lt;br /&gt;
+Copyright © 2002-2012 Chris Schoeneman, Nick Bolton, Volker Lanz.&lt;br /&gt;&lt;br /&gt;
 Synergy is released under the GNU General Public License (GPLv2).&lt;br /&gt;&lt;br /&gt;
 Synergy is based on CosmoSynergy by Richard Lee and Adam Feder.&lt;br /&gt;
 The Synergy GUI is based on QSynergy by Volker Lanz.&lt;br /&gt;&lt;br /&gt;
diff --git a/src/gui/src/AboutDialog.cpp b/src/gui/src/AboutDialog.cpp
index cbf1090e..4462f522 100644
--- a/src/gui/src/AboutDialog.cpp
+++ b/src/gui/src/AboutDialog.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
@@ -32,12 +33,12 @@ AboutDialog::AboutDialog(QWidget* parent, const QString& synergyApp) :
 
     // change default size based on os
 #if defined(Q_OS_MAC)
-	QSize size(600, 350);
+	QSize size(600, 380);
 	setMaximumSize(size);
 	setMinimumSize(size);
 	resize(size);
 #elif defined(Q_OS_LINUX)
-	QSize size(600, 300);
+	QSize size(600, 330);
 	setMaximumSize(size);
 	setMinimumSize(size);
 	resize(size);
diff --git a/src/gui/src/AboutDialog.h b/src/gui/src/AboutDialog.h
index 9722f16b..4f7a07c6 100644
--- a/src/gui/src/AboutDialog.h
+++ b/src/gui/src/AboutDialog.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Action.cpp b/src/gui/src/Action.cpp
index 0493b3c5..f7211e38 100644
--- a/src/gui/src/Action.cpp
+++ b/src/gui/src/Action.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Action.h b/src/gui/src/Action.h
index ee911421..bd19efcf 100644
--- a/src/gui/src/Action.h
+++ b/src/gui/src/Action.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp
index 0dfde93d..389996a8 100644
--- a/src/gui/src/ActionDialog.cpp
+++ b/src/gui/src/ActionDialog.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h
index 8bbee52a..dfb4d0db 100644
--- a/src/gui/src/ActionDialog.h
+++ b/src/gui/src/ActionDialog.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/AppConfig.cpp b/src/gui/src/AppConfig.cpp
index bbbc88f6..076c789f 100644
--- a/src/gui/src/AppConfig.cpp
+++ b/src/gui/src/AppConfig.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/AppConfig.h b/src/gui/src/AppConfig.h
index dbc066c3..ddce9706 100644
--- a/src/gui/src/AppConfig.h
+++ b/src/gui/src/AppConfig.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/BaseConfig.cpp b/src/gui/src/BaseConfig.cpp
index 1cf9a3c2..deebc921 100644
--- a/src/gui/src/BaseConfig.cpp
+++ b/src/gui/src/BaseConfig.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/BaseConfig.h b/src/gui/src/BaseConfig.h
index 541d3f82..f0d2d36e 100644
--- a/src/gui/src/BaseConfig.h
+++ b/src/gui/src/BaseConfig.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Hotkey.cpp b/src/gui/src/Hotkey.cpp
index 00cb7d72..17078ce8 100644
--- a/src/gui/src/Hotkey.cpp
+++ b/src/gui/src/Hotkey.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Hotkey.h b/src/gui/src/Hotkey.h
index 6f1f49bc..0d1448b7 100644
--- a/src/gui/src/Hotkey.h
+++ b/src/gui/src/Hotkey.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/HotkeyDialog.cpp b/src/gui/src/HotkeyDialog.cpp
index 060666d8..2a3ceb57 100644
--- a/src/gui/src/HotkeyDialog.cpp
+++ b/src/gui/src/HotkeyDialog.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/HotkeyDialog.h b/src/gui/src/HotkeyDialog.h
index c22726e9..75c02891 100644
--- a/src/gui/src/HotkeyDialog.h
+++ b/src/gui/src/HotkeyDialog.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Ipc.cpp b/src/gui/src/Ipc.cpp
index 41a7be0b..4f7d9316 100644
--- a/src/gui/src/Ipc.cpp
+++ b/src/gui/src/Ipc.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Ipc.h b/src/gui/src/Ipc.h
index a2324876..0bae0733 100644
--- a/src/gui/src/Ipc.h
+++ b/src/gui/src/Ipc.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/IpcClient.cpp b/src/gui/src/IpcClient.cpp
index 5e230745..0eeb5d29 100644
--- a/src/gui/src/IpcClient.cpp
+++ b/src/gui/src/IpcClient.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/IpcClient.h b/src/gui/src/IpcClient.h
index 517e64b1..6830483b 100644
--- a/src/gui/src/IpcClient.h
+++ b/src/gui/src/IpcClient.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/IpcReader.cpp b/src/gui/src/IpcReader.cpp
index c72b2bcf..288fb432 100644
--- a/src/gui/src/IpcReader.cpp
+++ b/src/gui/src/IpcReader.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/IpcReader.h b/src/gui/src/IpcReader.h
index 1b0dec3b..9c9f2942 100644
--- a/src/gui/src/IpcReader.h
+++ b/src/gui/src/IpcReader.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/KeySequence.cpp b/src/gui/src/KeySequence.cpp
index e063bd58..831a0c0d 100644
--- a/src/gui/src/KeySequence.cpp
+++ b/src/gui/src/KeySequence.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/KeySequence.h b/src/gui/src/KeySequence.h
index a4198615..da93cbc6 100644
--- a/src/gui/src/KeySequence.h
+++ b/src/gui/src/KeySequence.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/KeySequenceWidget.cpp b/src/gui/src/KeySequenceWidget.cpp
index ba6a73b6..ddaf16e1 100644
--- a/src/gui/src/KeySequenceWidget.cpp
+++ b/src/gui/src/KeySequenceWidget.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/KeySequenceWidget.h b/src/gui/src/KeySequenceWidget.h
index c4599523..c98e287b 100644
--- a/src/gui/src/KeySequenceWidget.h
+++ b/src/gui/src/KeySequenceWidget.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 52eda08e..db308bae 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index b968115e..b80fe16e 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/NewScreenWidget.cpp b/src/gui/src/NewScreenWidget.cpp
index f3e4b25e..43da45c5 100644
--- a/src/gui/src/NewScreenWidget.cpp
+++ b/src/gui/src/NewScreenWidget.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/NewScreenWidget.h b/src/gui/src/NewScreenWidget.h
index a26fceb3..3b42b4a4 100644
--- a/src/gui/src/NewScreenWidget.h
+++ b/src/gui/src/NewScreenWidget.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/QSynergyApplication.cpp b/src/gui/src/QSynergyApplication.cpp
index c0b0dcf8..2fb6d499 100644
--- a/src/gui/src/QSynergyApplication.cpp
+++ b/src/gui/src/QSynergyApplication.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/QSynergyApplication.h b/src/gui/src/QSynergyApplication.h
index a6e9223f..4e991548 100644
--- a/src/gui/src/QSynergyApplication.h
+++ b/src/gui/src/QSynergyApplication.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Screen.cpp b/src/gui/src/Screen.cpp
index b35b2eee..74c9ada8 100644
--- a/src/gui/src/Screen.cpp
+++ b/src/gui/src/Screen.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/Screen.h b/src/gui/src/Screen.h
index 63771281..c8bf8cfc 100644
--- a/src/gui/src/Screen.h
+++ b/src/gui/src/Screen.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ScreenSettingsDialog.cpp b/src/gui/src/ScreenSettingsDialog.cpp
index 96276e89..79e45c9f 100644
--- a/src/gui/src/ScreenSettingsDialog.cpp
+++ b/src/gui/src/ScreenSettingsDialog.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ScreenSettingsDialog.h b/src/gui/src/ScreenSettingsDialog.h
index 876b31e4..3811d8dc 100644
--- a/src/gui/src/ScreenSettingsDialog.h
+++ b/src/gui/src/ScreenSettingsDialog.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ScreenSetupModel.cpp b/src/gui/src/ScreenSetupModel.cpp
index f2fb4126..6b6d5aac 100644
--- a/src/gui/src/ScreenSetupModel.cpp
+++ b/src/gui/src/ScreenSetupModel.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ScreenSetupModel.h b/src/gui/src/ScreenSetupModel.h
index 1537e7f1..c53c133c 100644
--- a/src/gui/src/ScreenSetupModel.h
+++ b/src/gui/src/ScreenSetupModel.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
index b238eaed..052158dc 100644
--- a/src/gui/src/ScreenSetupView.cpp
+++ b/src/gui/src/ScreenSetupView.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ScreenSetupView.h b/src/gui/src/ScreenSetupView.h
index b6e4d156..970e7c8b 100644
--- a/src/gui/src/ScreenSetupView.h
+++ b/src/gui/src/ScreenSetupView.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
index 386d447d..7823e19f 100644
--- a/src/gui/src/ServerConfig.cpp
+++ b/src/gui/src/ServerConfig.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h
index 327b5556..d1b5d75d 100644
--- a/src/gui/src/ServerConfig.h
+++ b/src/gui/src/ServerConfig.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ServerConfigDialog.cpp b/src/gui/src/ServerConfigDialog.cpp
index aea75278..d37d29a5 100644
--- a/src/gui/src/ServerConfigDialog.cpp
+++ b/src/gui/src/ServerConfigDialog.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/ServerConfigDialog.h b/src/gui/src/ServerConfigDialog.h
index 9fb34b16..f27abe87 100644
--- a/src/gui/src/ServerConfigDialog.h
+++ b/src/gui/src/ServerConfigDialog.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/SettingsDialog.cpp b/src/gui/src/SettingsDialog.cpp
index 4fd50086..fc425c95 100644
--- a/src/gui/src/SettingsDialog.cpp
+++ b/src/gui/src/SettingsDialog.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/SettingsDialog.h b/src/gui/src/SettingsDialog.h
index 25f3ec7e..603328b2 100644
--- a/src/gui/src/SettingsDialog.h
+++ b/src/gui/src/SettingsDialog.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/SetupWizard.cpp b/src/gui/src/SetupWizard.cpp
index 5e8e7d05..e82b6b54 100644
--- a/src/gui/src/SetupWizard.cpp
+++ b/src/gui/src/SetupWizard.cpp
@@ -1,3 +1,20 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package 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/>.
+ */
+ 
 #include "SetupWizard.h"
 #include "MainWindow.h"
 
diff --git a/src/gui/src/SetupWizard.h b/src/gui/src/SetupWizard.h
index 8a760974..d2d8953d 100644
--- a/src/gui/src/SetupWizard.h
+++ b/src/gui/src/SetupWizard.h
@@ -1,3 +1,20 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * 
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file COPYING that should have accompanied this file.
+ * 
+ * This package 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/>.
+ */
+
 #pragma once
 
 #include <QWizard>
diff --git a/src/gui/src/TcpSocketReader.cpp b/src/gui/src/TcpSocketReader.cpp
index a5226a27..f5d7750c 100644
--- a/src/gui/src/TcpSocketReader.cpp
+++ b/src/gui/src/TcpSocketReader.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/TrashScreenWidget.cpp b/src/gui/src/TrashScreenWidget.cpp
index 1be9aabc..aa0f9acf 100644
--- a/src/gui/src/TrashScreenWidget.cpp
+++ b/src/gui/src/TrashScreenWidget.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/TrashScreenWidget.h b/src/gui/src/TrashScreenWidget.h
index 34a5608e..514f3509 100644
--- a/src/gui/src/TrashScreenWidget.h
+++ b/src/gui/src/TrashScreenWidget.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/VersionChecker.cpp b/src/gui/src/VersionChecker.cpp
index decd4d49..7bf36ae8 100644
--- a/src/gui/src/VersionChecker.cpp
+++ b/src/gui/src/VersionChecker.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/VersionChecker.h b/src/gui/src/VersionChecker.h
index 88924a4d..a35eb738 100644
--- a/src/gui/src/VersionChecker.h
+++ b/src/gui/src/VersionChecker.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/gui/src/main.cpp b/src/gui/src/main.cpp
index e81193ff..66bba88d 100644
--- a/src/gui/src/main.cpp
+++ b/src/gui/src/main.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2008 Volker Lanz (vl@fidra.de)
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 7b94a699..1402c65b 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArch.cpp b/src/lib/arch/CArch.cpp
index d3fc996b..5e96fbe2 100644
--- a/src/lib/arch/CArch.cpp
+++ b/src/lib/arch/CArch.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArch.h b/src/lib/arch/CArch.h
index 9eecc68f..38fed0c7 100644
--- a/src/lib/arch/CArch.h
+++ b/src/lib/arch/CArch.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchConsoleStd.cpp b/src/lib/arch/CArchConsoleStd.cpp
index b579bc0a..91b4426f 100644
--- a/src/lib/arch/CArchConsoleStd.cpp
+++ b/src/lib/arch/CArchConsoleStd.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchConsoleStd.h b/src/lib/arch/CArchConsoleStd.h
index 1863d2a3..e865115a 100644
--- a/src/lib/arch/CArchConsoleStd.h
+++ b/src/lib/arch/CArchConsoleStd.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchConsoleUnix.cpp b/src/lib/arch/CArchConsoleUnix.cpp
index 4f934f74..b10e64b2 100644
--- a/src/lib/arch/CArchConsoleUnix.cpp
+++ b/src/lib/arch/CArchConsoleUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchConsoleUnix.h b/src/lib/arch/CArchConsoleUnix.h
index 18141d07..8281c5fa 100644
--- a/src/lib/arch/CArchConsoleUnix.h
+++ b/src/lib/arch/CArchConsoleUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchConsoleWindows.cpp b/src/lib/arch/CArchConsoleWindows.cpp
index 33315573..0f422c85 100644
--- a/src/lib/arch/CArchConsoleWindows.cpp
+++ b/src/lib/arch/CArchConsoleWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchConsoleWindows.h b/src/lib/arch/CArchConsoleWindows.h
index f86f7501..8cdbe9f0 100644
--- a/src/lib/arch/CArchConsoleWindows.h
+++ b/src/lib/arch/CArchConsoleWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchDaemonNone.cpp b/src/lib/arch/CArchDaemonNone.cpp
index 65d375f6..ca6442ef 100644
--- a/src/lib/arch/CArchDaemonNone.cpp
+++ b/src/lib/arch/CArchDaemonNone.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchDaemonNone.h b/src/lib/arch/CArchDaemonNone.h
index 8e942b0f..6439c6a9 100644
--- a/src/lib/arch/CArchDaemonNone.h
+++ b/src/lib/arch/CArchDaemonNone.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchDaemonUnix.cpp b/src/lib/arch/CArchDaemonUnix.cpp
index cc6c986a..18c0f4f5 100644
--- a/src/lib/arch/CArchDaemonUnix.cpp
+++ b/src/lib/arch/CArchDaemonUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchDaemonUnix.h b/src/lib/arch/CArchDaemonUnix.h
index 8c2b9946..34ca552e 100644
--- a/src/lib/arch/CArchDaemonUnix.h
+++ b/src/lib/arch/CArchDaemonUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchDaemonWindows.cpp b/src/lib/arch/CArchDaemonWindows.cpp
index 04cb3084..a24d7a35 100644
--- a/src/lib/arch/CArchDaemonWindows.cpp
+++ b/src/lib/arch/CArchDaemonWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchDaemonWindows.h b/src/lib/arch/CArchDaemonWindows.h
index dc699ac8..2cc8af8d 100644
--- a/src/lib/arch/CArchDaemonWindows.h
+++ b/src/lib/arch/CArchDaemonWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchFileUnix.cpp b/src/lib/arch/CArchFileUnix.cpp
index 526811b9..d71f416d 100644
--- a/src/lib/arch/CArchFileUnix.cpp
+++ b/src/lib/arch/CArchFileUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchFileUnix.h b/src/lib/arch/CArchFileUnix.h
index 0c4e9254..815387e7 100644
--- a/src/lib/arch/CArchFileUnix.h
+++ b/src/lib/arch/CArchFileUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchFileWindows.cpp b/src/lib/arch/CArchFileWindows.cpp
index c75752c5..c7a506d7 100644
--- a/src/lib/arch/CArchFileWindows.cpp
+++ b/src/lib/arch/CArchFileWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchFileWindows.h b/src/lib/arch/CArchFileWindows.h
index a3cf5075..0f476356 100644
--- a/src/lib/arch/CArchFileWindows.h
+++ b/src/lib/arch/CArchFileWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchLogUnix.cpp b/src/lib/arch/CArchLogUnix.cpp
index 7e66bb76..3421200c 100644
--- a/src/lib/arch/CArchLogUnix.cpp
+++ b/src/lib/arch/CArchLogUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchLogUnix.h b/src/lib/arch/CArchLogUnix.h
index 800526c5..1203b218 100644
--- a/src/lib/arch/CArchLogUnix.h
+++ b/src/lib/arch/CArchLogUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchLogWindows.cpp b/src/lib/arch/CArchLogWindows.cpp
index fad39e2e..3f756fde 100644
--- a/src/lib/arch/CArchLogWindows.cpp
+++ b/src/lib/arch/CArchLogWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchLogWindows.h b/src/lib/arch/CArchLogWindows.h
index 38ab2931..b3f490a8 100644
--- a/src/lib/arch/CArchLogWindows.h
+++ b/src/lib/arch/CArchLogWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchMiscWindows.cpp b/src/lib/arch/CArchMiscWindows.cpp
index 90df083f..4f63c27e 100644
--- a/src/lib/arch/CArchMiscWindows.cpp
+++ b/src/lib/arch/CArchMiscWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchMiscWindows.h b/src/lib/arch/CArchMiscWindows.h
index 6348218e..8d31cd98 100644
--- a/src/lib/arch/CArchMiscWindows.h
+++ b/src/lib/arch/CArchMiscWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchMultithreadPosix.cpp b/src/lib/arch/CArchMultithreadPosix.cpp
index 1c5f0789..8d2c788e 100644
--- a/src/lib/arch/CArchMultithreadPosix.cpp
+++ b/src/lib/arch/CArchMultithreadPosix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchMultithreadPosix.h b/src/lib/arch/CArchMultithreadPosix.h
index 031adcd7..c5da4196 100644
--- a/src/lib/arch/CArchMultithreadPosix.h
+++ b/src/lib/arch/CArchMultithreadPosix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchMultithreadWindows.cpp b/src/lib/arch/CArchMultithreadWindows.cpp
index d7a6101b..23006edf 100644
--- a/src/lib/arch/CArchMultithreadWindows.cpp
+++ b/src/lib/arch/CArchMultithreadWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchMultithreadWindows.h b/src/lib/arch/CArchMultithreadWindows.h
index 71414b0b..b7980c76 100644
--- a/src/lib/arch/CArchMultithreadWindows.h
+++ b/src/lib/arch/CArchMultithreadWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchNetworkBSD.cpp b/src/lib/arch/CArchNetworkBSD.cpp
index 0b66ffbb..a9d1c978 100644
--- a/src/lib/arch/CArchNetworkBSD.cpp
+++ b/src/lib/arch/CArchNetworkBSD.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchNetworkBSD.h b/src/lib/arch/CArchNetworkBSD.h
index 4f0ea5eb..9ae4a25c 100644
--- a/src/lib/arch/CArchNetworkBSD.h
+++ b/src/lib/arch/CArchNetworkBSD.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchNetworkWinsock.cpp b/src/lib/arch/CArchNetworkWinsock.cpp
index 1204ae99..ee23219a 100644
--- a/src/lib/arch/CArchNetworkWinsock.cpp
+++ b/src/lib/arch/CArchNetworkWinsock.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchNetworkWinsock.h b/src/lib/arch/CArchNetworkWinsock.h
index 5bcd0a86..e0066363 100644
--- a/src/lib/arch/CArchNetworkWinsock.h
+++ b/src/lib/arch/CArchNetworkWinsock.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchPluginUnix.cpp b/src/lib/arch/CArchPluginUnix.cpp
index 68f243ce..d0a082b6 100644
--- a/src/lib/arch/CArchPluginUnix.cpp
+++ b/src/lib/arch/CArchPluginUnix.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/arch/CArchPluginUnix.h b/src/lib/arch/CArchPluginUnix.h
index 428feef2..03a2940d 100644
--- a/src/lib/arch/CArchPluginUnix.h
+++ b/src/lib/arch/CArchPluginUnix.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/arch/CArchPluginWindows.cpp b/src/lib/arch/CArchPluginWindows.cpp
index 89e62528..d54d74fb 100644
--- a/src/lib/arch/CArchPluginWindows.cpp
+++ b/src/lib/arch/CArchPluginWindows.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/arch/CArchPluginWindows.h b/src/lib/arch/CArchPluginWindows.h
index 9cc2f4ed..70054135 100644
--- a/src/lib/arch/CArchPluginWindows.h
+++ b/src/lib/arch/CArchPluginWindows.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/arch/CArchSleepUnix.cpp b/src/lib/arch/CArchSleepUnix.cpp
index 9f5b5c62..8a88fd5e 100644
--- a/src/lib/arch/CArchSleepUnix.cpp
+++ b/src/lib/arch/CArchSleepUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSleepUnix.h b/src/lib/arch/CArchSleepUnix.h
index 245e52ef..4ca3e992 100644
--- a/src/lib/arch/CArchSleepUnix.h
+++ b/src/lib/arch/CArchSleepUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSleepWindows.cpp b/src/lib/arch/CArchSleepWindows.cpp
index ce049471..dce14e72 100644
--- a/src/lib/arch/CArchSleepWindows.cpp
+++ b/src/lib/arch/CArchSleepWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSleepWindows.h b/src/lib/arch/CArchSleepWindows.h
index 398bda3f..4c68f29c 100644
--- a/src/lib/arch/CArchSleepWindows.h
+++ b/src/lib/arch/CArchSleepWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchStringUnix.cpp b/src/lib/arch/CArchStringUnix.cpp
index 65a157e8..c7d871e3 100644
--- a/src/lib/arch/CArchStringUnix.cpp
+++ b/src/lib/arch/CArchStringUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchStringUnix.h b/src/lib/arch/CArchStringUnix.h
index d7b31f1a..6c58d87b 100644
--- a/src/lib/arch/CArchStringUnix.h
+++ b/src/lib/arch/CArchStringUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchStringWindows.cpp b/src/lib/arch/CArchStringWindows.cpp
index dc76f7da..981c0126 100644
--- a/src/lib/arch/CArchStringWindows.cpp
+++ b/src/lib/arch/CArchStringWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchStringWindows.h b/src/lib/arch/CArchStringWindows.h
index 9de3dd1e..6d068691 100644
--- a/src/lib/arch/CArchStringWindows.h
+++ b/src/lib/arch/CArchStringWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSystemUnix.cpp b/src/lib/arch/CArchSystemUnix.cpp
index 9b3054ae..4d0aa2a5 100644
--- a/src/lib/arch/CArchSystemUnix.cpp
+++ b/src/lib/arch/CArchSystemUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSystemUnix.h b/src/lib/arch/CArchSystemUnix.h
index 5d384d37..e13400c4 100644
--- a/src/lib/arch/CArchSystemUnix.h
+++ b/src/lib/arch/CArchSystemUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSystemWindows.cpp b/src/lib/arch/CArchSystemWindows.cpp
index fce613ed..c7771719 100644
--- a/src/lib/arch/CArchSystemWindows.cpp
+++ b/src/lib/arch/CArchSystemWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchSystemWindows.h b/src/lib/arch/CArchSystemWindows.h
index 1fcef482..7bd0a0a1 100644
--- a/src/lib/arch/CArchSystemWindows.h
+++ b/src/lib/arch/CArchSystemWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTaskBarWindows.cpp b/src/lib/arch/CArchTaskBarWindows.cpp
index 8c36b81c..2ff67ad8 100644
--- a/src/lib/arch/CArchTaskBarWindows.cpp
+++ b/src/lib/arch/CArchTaskBarWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTaskBarWindows.h b/src/lib/arch/CArchTaskBarWindows.h
index f5d7eff6..2b21c84a 100644
--- a/src/lib/arch/CArchTaskBarWindows.h
+++ b/src/lib/arch/CArchTaskBarWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTaskBarXWindows.cpp b/src/lib/arch/CArchTaskBarXWindows.cpp
index d7166b54..bba1f835 100644
--- a/src/lib/arch/CArchTaskBarXWindows.cpp
+++ b/src/lib/arch/CArchTaskBarXWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTaskBarXWindows.h b/src/lib/arch/CArchTaskBarXWindows.h
index 7e195518..d80e1fe1 100644
--- a/src/lib/arch/CArchTaskBarXWindows.h
+++ b/src/lib/arch/CArchTaskBarXWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTimeUnix.cpp b/src/lib/arch/CArchTimeUnix.cpp
index 8ff4cb14..0f249186 100644
--- a/src/lib/arch/CArchTimeUnix.cpp
+++ b/src/lib/arch/CArchTimeUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTimeUnix.h b/src/lib/arch/CArchTimeUnix.h
index 19df6c78..a1c8fa40 100644
--- a/src/lib/arch/CArchTimeUnix.h
+++ b/src/lib/arch/CArchTimeUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTimeWindows.cpp b/src/lib/arch/CArchTimeWindows.cpp
index 5fa86eda..9899d2a4 100644
--- a/src/lib/arch/CArchTimeWindows.cpp
+++ b/src/lib/arch/CArchTimeWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CArchTimeWindows.h b/src/lib/arch/CArchTimeWindows.h
index c91f4744..defcba2d 100644
--- a/src/lib/arch/CArchTimeWindows.h
+++ b/src/lib/arch/CArchTimeWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CMakeLists.txt b/src/lib/arch/CMakeLists.txt
index adce4c37..dfcba1d0 100644
--- a/src/lib/arch/CMakeLists.txt
+++ b/src/lib/arch/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/CMultibyte.h b/src/lib/arch/CMultibyte.h
index e8e1c4e1..2d4e1555 100644
--- a/src/lib/arch/CMultibyte.h
+++ b/src/lib/arch/CMultibyte.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchConsole.h b/src/lib/arch/IArchConsole.h
index f70efdfc..e99711c1 100644
--- a/src/lib/arch/IArchConsole.h
+++ b/src/lib/arch/IArchConsole.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchDaemon.h b/src/lib/arch/IArchDaemon.h
index a8949690..5070747b 100644
--- a/src/lib/arch/IArchDaemon.h
+++ b/src/lib/arch/IArchDaemon.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h
index ffd74819..4d5ec281 100644
--- a/src/lib/arch/IArchFile.h
+++ b/src/lib/arch/IArchFile.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchLog.h b/src/lib/arch/IArchLog.h
index 12fd4731..2b66a82e 100644
--- a/src/lib/arch/IArchLog.h
+++ b/src/lib/arch/IArchLog.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchMultithread.h b/src/lib/arch/IArchMultithread.h
index b7047bea..3e5375f9 100644
--- a/src/lib/arch/IArchMultithread.h
+++ b/src/lib/arch/IArchMultithread.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h
index cfc17ffc..98d1dc55 100644
--- a/src/lib/arch/IArchNetwork.h
+++ b/src/lib/arch/IArchNetwork.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchPlugin.h b/src/lib/arch/IArchPlugin.h
index 2214b0d8..4f161d03 100644
--- a/src/lib/arch/IArchPlugin.h
+++ b/src/lib/arch/IArchPlugin.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/arch/IArchSleep.h b/src/lib/arch/IArchSleep.h
index e89cc709..8d6536c6 100644
--- a/src/lib/arch/IArchSleep.h
+++ b/src/lib/arch/IArchSleep.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchString.cpp b/src/lib/arch/IArchString.cpp
index 21d56faa..fc063c9d 100644
--- a/src/lib/arch/IArchString.cpp
+++ b/src/lib/arch/IArchString.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchString.h b/src/lib/arch/IArchString.h
index c180bce9..a962df12 100644
--- a/src/lib/arch/IArchString.h
+++ b/src/lib/arch/IArchString.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchSystem.h b/src/lib/arch/IArchSystem.h
index 2c10bf03..74dff112 100644
--- a/src/lib/arch/IArchSystem.h
+++ b/src/lib/arch/IArchSystem.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchTaskBar.h b/src/lib/arch/IArchTaskBar.h
index 1398a88a..244ec30f 100644
--- a/src/lib/arch/IArchTaskBar.h
+++ b/src/lib/arch/IArchTaskBar.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchTaskBarReceiver.h b/src/lib/arch/IArchTaskBarReceiver.h
index 0cf1a338..d5becd48 100644
--- a/src/lib/arch/IArchTaskBarReceiver.h
+++ b/src/lib/arch/IArchTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/IArchTime.h b/src/lib/arch/IArchTime.h
index 6d48b7d5..f25c2be0 100644
--- a/src/lib/arch/IArchTime.h
+++ b/src/lib/arch/IArchTime.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/XArch.cpp b/src/lib/arch/XArch.cpp
index e322ddc6..0cc2e577 100644
--- a/src/lib/arch/XArch.cpp
+++ b/src/lib/arch/XArch.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/XArch.h b/src/lib/arch/XArch.h
index 7541f76f..2f87be1c 100644
--- a/src/lib/arch/XArch.h
+++ b/src/lib/arch/XArch.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/XArchUnix.cpp b/src/lib/arch/XArchUnix.cpp
index 0cd587a5..b276fa1d 100644
--- a/src/lib/arch/XArchUnix.cpp
+++ b/src/lib/arch/XArchUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/XArchUnix.h b/src/lib/arch/XArchUnix.h
index 16128b06..5e3e73fd 100644
--- a/src/lib/arch/XArchUnix.h
+++ b/src/lib/arch/XArchUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/XArchWindows.cpp b/src/lib/arch/XArchWindows.cpp
index 425a9edf..2d6c5885 100644
--- a/src/lib/arch/XArchWindows.cpp
+++ b/src/lib/arch/XArchWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/XArchWindows.h b/src/lib/arch/XArchWindows.h
index 186c5238..c85765ea 100644
--- a/src/lib/arch/XArchWindows.h
+++ b/src/lib/arch/XArchWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/arch/vsnprintf.h b/src/lib/arch/vsnprintf.h
index c8e1a471..4b848a55 100644
--- a/src/lib/arch/vsnprintf.h
+++ b/src/lib/arch/vsnprintf.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CEvent.cpp b/src/lib/base/CEvent.cpp
index a8a30f37..ec2df657 100644
--- a/src/lib/base/CEvent.cpp
+++ b/src/lib/base/CEvent.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CEvent.h b/src/lib/base/CEvent.h
index aae80783..8201d057 100644
--- a/src/lib/base/CEvent.h
+++ b/src/lib/base/CEvent.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CEventQueue.cpp b/src/lib/base/CEventQueue.cpp
index ed8cdb2f..c661c4a2 100644
--- a/src/lib/base/CEventQueue.cpp
+++ b/src/lib/base/CEventQueue.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CEventQueue.h b/src/lib/base/CEventQueue.h
index 2c694fa2..91dba04d 100644
--- a/src/lib/base/CEventQueue.h
+++ b/src/lib/base/CEventQueue.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CFunctionEventJob.cpp b/src/lib/base/CFunctionEventJob.cpp
index 5a666d59..21f0e308 100644
--- a/src/lib/base/CFunctionEventJob.cpp
+++ b/src/lib/base/CFunctionEventJob.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CFunctionEventJob.h b/src/lib/base/CFunctionEventJob.h
index 97de67ec..2c3f9a6e 100644
--- a/src/lib/base/CFunctionEventJob.h
+++ b/src/lib/base/CFunctionEventJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CFunctionJob.cpp b/src/lib/base/CFunctionJob.cpp
index d55d4409..1296133b 100644
--- a/src/lib/base/CFunctionJob.cpp
+++ b/src/lib/base/CFunctionJob.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CFunctionJob.h b/src/lib/base/CFunctionJob.h
index c33e9d91..dcdbf5b0 100644
--- a/src/lib/base/CFunctionJob.h
+++ b/src/lib/base/CFunctionJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CLog.cpp b/src/lib/base/CLog.cpp
index bc49e842..3b097c3c 100644
--- a/src/lib/base/CLog.cpp
+++ b/src/lib/base/CLog.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CLog.h b/src/lib/base/CLog.h
index 6e83aeb0..6f5adcdd 100644
--- a/src/lib/base/CLog.h
+++ b/src/lib/base/CLog.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CMakeLists.txt b/src/lib/base/CMakeLists.txt
index 2e623587..3f610847 100644
--- a/src/lib/base/CMakeLists.txt
+++ b/src/lib/base/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CPriorityQueue.h b/src/lib/base/CPriorityQueue.h
index 02d72c33..23f1c59a 100644
--- a/src/lib/base/CPriorityQueue.h
+++ b/src/lib/base/CPriorityQueue.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CSimpleEventQueueBuffer.cpp b/src/lib/base/CSimpleEventQueueBuffer.cpp
index 6fbce095..5560ef99 100644
--- a/src/lib/base/CSimpleEventQueueBuffer.cpp
+++ b/src/lib/base/CSimpleEventQueueBuffer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CSimpleEventQueueBuffer.h b/src/lib/base/CSimpleEventQueueBuffer.h
index 0987a206..b3daa69c 100644
--- a/src/lib/base/CSimpleEventQueueBuffer.h
+++ b/src/lib/base/CSimpleEventQueueBuffer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CStopwatch.cpp b/src/lib/base/CStopwatch.cpp
index af43d7e8..f76f8088 100644
--- a/src/lib/base/CStopwatch.cpp
+++ b/src/lib/base/CStopwatch.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CStopwatch.h b/src/lib/base/CStopwatch.h
index 4ad49c5e..c993e215 100644
--- a/src/lib/base/CStopwatch.h
+++ b/src/lib/base/CStopwatch.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CString.h b/src/lib/base/CString.h
index 630508c7..f27db1e2 100644
--- a/src/lib/base/CString.h
+++ b/src/lib/base/CString.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CStringUtil.cpp b/src/lib/base/CStringUtil.cpp
index 8033fe78..3119dd26 100644
--- a/src/lib/base/CStringUtil.cpp
+++ b/src/lib/base/CStringUtil.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CStringUtil.h b/src/lib/base/CStringUtil.h
index 408f5a91..d724d7b2 100644
--- a/src/lib/base/CStringUtil.h
+++ b/src/lib/base/CStringUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CUnicode.cpp b/src/lib/base/CUnicode.cpp
index 894b3f9f..123b8d66 100644
--- a/src/lib/base/CUnicode.cpp
+++ b/src/lib/base/CUnicode.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/CUnicode.h b/src/lib/base/CUnicode.h
index 99621003..a5efa584 100644
--- a/src/lib/base/CUnicode.h
+++ b/src/lib/base/CUnicode.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/ELevel.h b/src/lib/base/ELevel.h
index 1552d40a..49ec9638 100644
--- a/src/lib/base/ELevel.h
+++ b/src/lib/base/ELevel.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/IEventJob.h b/src/lib/base/IEventJob.h
index d9a2deb7..6dafbb1a 100644
--- a/src/lib/base/IEventJob.h
+++ b/src/lib/base/IEventJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/IEventQueue.cpp b/src/lib/base/IEventQueue.cpp
index 36c65b29..63fd5c9e 100644
--- a/src/lib/base/IEventQueue.cpp
+++ b/src/lib/base/IEventQueue.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/IEventQueue.h b/src/lib/base/IEventQueue.h
index 2a5dc91f..21de098e 100644
--- a/src/lib/base/IEventQueue.h
+++ b/src/lib/base/IEventQueue.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/IEventQueueBuffer.h b/src/lib/base/IEventQueueBuffer.h
index d9e6ae96..6550d516 100644
--- a/src/lib/base/IEventQueueBuffer.h
+++ b/src/lib/base/IEventQueueBuffer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/IJob.h b/src/lib/base/IJob.h
index 7de55064..c77397bd 100644
--- a/src/lib/base/IJob.h
+++ b/src/lib/base/IJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/ILogOutputter.h b/src/lib/base/ILogOutputter.h
index 6aa8b0b3..a5590e7f 100644
--- a/src/lib/base/ILogOutputter.h
+++ b/src/lib/base/ILogOutputter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/LogOutputters.cpp b/src/lib/base/LogOutputters.cpp
index 4d9fb787..2bb03622 100644
--- a/src/lib/base/LogOutputters.cpp
+++ b/src/lib/base/LogOutputters.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/LogOutputters.h b/src/lib/base/LogOutputters.h
index 24727be4..f60fa5ae 100644
--- a/src/lib/base/LogOutputters.h
+++ b/src/lib/base/LogOutputters.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/TMethodEventJob.h b/src/lib/base/TMethodEventJob.h
index d8206735..0780c36c 100644
--- a/src/lib/base/TMethodEventJob.h
+++ b/src/lib/base/TMethodEventJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/TMethodJob.h b/src/lib/base/TMethodJob.h
index 27c17103..55f5b999 100644
--- a/src/lib/base/TMethodJob.h
+++ b/src/lib/base/TMethodJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/XBase.cpp b/src/lib/base/XBase.cpp
index 4221fa61..ac54b61a 100644
--- a/src/lib/base/XBase.cpp
+++ b/src/lib/base/XBase.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/base/XBase.h b/src/lib/base/XBase.h
index 79fde568..490ada79 100644
--- a/src/lib/base/XBase.h
+++ b/src/lib/base/XBase.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/client/CClient.cpp b/src/lib/client/CClient.cpp
index 5c8d982e..46387377 100644
--- a/src/lib/client/CClient.cpp
+++ b/src/lib/client/CClient.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/client/CClient.h b/src/lib/client/CClient.h
index 69fd4962..ea9ce92d 100644
--- a/src/lib/client/CClient.h
+++ b/src/lib/client/CClient.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/client/CMakeLists.txt b/src/lib/client/CMakeLists.txt
index 44e54ab1..b40bbc7f 100644
--- a/src/lib/client/CMakeLists.txt
+++ b/src/lib/client/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/client/CServerProxy.cpp b/src/lib/client/CServerProxy.cpp
index d34c594b..659412b1 100644
--- a/src/lib/client/CServerProxy.cpp
+++ b/src/lib/client/CServerProxy.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/client/CServerProxy.h b/src/lib/client/CServerProxy.h
index 20e5328c..fe763f58 100644
--- a/src/lib/client/CServerProxy.h
+++ b/src/lib/client/CServerProxy.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/BasicTypes.h b/src/lib/common/BasicTypes.h
index 2e89ff42..d5163902 100644
--- a/src/lib/common/BasicTypes.h
+++ b/src/lib/common/BasicTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/CMakeLists.txt b/src/lib/common/CMakeLists.txt
index a92eb1b7..611ff1b3 100644
--- a/src/lib/common/CMakeLists.txt
+++ b/src/lib/common/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/IInterface.h b/src/lib/common/IInterface.h
index ad4176fd..7c5934ea 100644
--- a/src/lib/common/IInterface.h
+++ b/src/lib/common/IInterface.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/MacOSXPrecomp.h b/src/lib/common/MacOSXPrecomp.h
index fab1e83d..dbf12d5a 100644
--- a/src/lib/common/MacOSXPrecomp.h
+++ b/src/lib/common/MacOSXPrecomp.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/Version.cpp b/src/lib/common/Version.cpp
index 8f551269..afa27bf9 100644
--- a/src/lib/common/Version.cpp
+++ b/src/lib/common/Version.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -18,7 +19,9 @@
 #include "Version.h"
 
 const char* kApplication = "Synergy";
-const char* kCopyright   = "Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea";
+const char* kCopyright   = "Copyright (C) 2012 Bolton Software Ltd.\n"
+                           "Copyright (C) 2008-2012 Nick Bolton\n"
+                           "Copyright (C) 2002-2012 Chris Schoeneman";
 const char* kContact     = "Synergy Mailing List, synergy-plus@googlegroups.com";
 const char* kWebsite     = "http://synergy-foss.org/";
 const char* kVersion     = VERSION;
diff --git a/src/lib/common/Version.h b/src/lib/common/Version.h
index be189961..8a0eff0f 100644
--- a/src/lib/common/Version.h
+++ b/src/lib/common/Version.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/common.h b/src/lib/common/common.h
index 3f395786..84c1f18f 100644
--- a/src/lib/common/common.h
+++ b/src/lib/common/common.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdbitset.h b/src/lib/common/stdbitset.h
index d3a93a5f..59fb7138 100644
--- a/src/lib/common/stdbitset.h
+++ b/src/lib/common/stdbitset.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stddeque.h b/src/lib/common/stddeque.h
index 7a52facb..c33b4e90 100644
--- a/src/lib/common/stddeque.h
+++ b/src/lib/common/stddeque.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdfstream.h b/src/lib/common/stdfstream.h
index 95856248..22459ebe 100644
--- a/src/lib/common/stdfstream.h
+++ b/src/lib/common/stdfstream.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdistream.h b/src/lib/common/stdistream.h
index 496b8bdb..a6528f3b 100644
--- a/src/lib/common/stdistream.h
+++ b/src/lib/common/stdistream.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdlist.h b/src/lib/common/stdlist.h
index 16ae5671..bd5e28a7 100644
--- a/src/lib/common/stdlist.h
+++ b/src/lib/common/stdlist.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdmap.h b/src/lib/common/stdmap.h
index 09230c83..b4b0b988 100644
--- a/src/lib/common/stdmap.h
+++ b/src/lib/common/stdmap.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdostream.h b/src/lib/common/stdostream.h
index 7e58bae2..70a2695c 100644
--- a/src/lib/common/stdostream.h
+++ b/src/lib/common/stdostream.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdpost.h b/src/lib/common/stdpost.h
index c5f6e882..2227ada2 100644
--- a/src/lib/common/stdpost.h
+++ b/src/lib/common/stdpost.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdpre.h b/src/lib/common/stdpre.h
index ce64fd1e..4978bf3c 100644
--- a/src/lib/common/stdpre.h
+++ b/src/lib/common/stdpre.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdset.h b/src/lib/common/stdset.h
index 0916a7af..99fe9ab4 100644
--- a/src/lib/common/stdset.h
+++ b/src/lib/common/stdset.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdsstream.h b/src/lib/common/stdsstream.h
index 8f70bafa..d94bce76 100644
--- a/src/lib/common/stdsstream.h
+++ b/src/lib/common/stdsstream.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,6 +27,7 @@
 // by Magnus Fromreide of the sstream in g++ 3.0.
 
 /* This is part of libio/iostream, providing -*- C++ -*- input/output.
+Copyright (C) 2012 Bolton Software Ltd.
 Copyright (C) 2000 Free Software Foundation
 
 This file is part of the GNU IO Library.  This library is free
diff --git a/src/lib/common/stdstring.h b/src/lib/common/stdstring.h
index 54c3be31..ce5713e2 100644
--- a/src/lib/common/stdstring.h
+++ b/src/lib/common/stdstring.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/common/stdvector.h b/src/lib/common/stdvector.h
index bbde89f7..772149a5 100644
--- a/src/lib/common/stdvector.h
+++ b/src/lib/common/stdvector.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/CMakeLists.txt b/src/lib/io/CMakeLists.txt
index 4fdaf92b..dc345aa8 100644
--- a/src/lib/io/CMakeLists.txt
+++ b/src/lib/io/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/CStreamBuffer.cpp b/src/lib/io/CStreamBuffer.cpp
index 23b5a870..4ced37b6 100644
--- a/src/lib/io/CStreamBuffer.cpp
+++ b/src/lib/io/CStreamBuffer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/CStreamBuffer.h b/src/lib/io/CStreamBuffer.h
index 53fafdb6..3a1fac3b 100644
--- a/src/lib/io/CStreamBuffer.h
+++ b/src/lib/io/CStreamBuffer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/CStreamFilter.cpp b/src/lib/io/CStreamFilter.cpp
index 85695f3b..d800d696 100644
--- a/src/lib/io/CStreamFilter.cpp
+++ b/src/lib/io/CStreamFilter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/CStreamFilter.h b/src/lib/io/CStreamFilter.h
index f5aa6e22..2eb5f9d4 100644
--- a/src/lib/io/CStreamFilter.h
+++ b/src/lib/io/CStreamFilter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/IStream.cpp b/src/lib/io/IStream.cpp
index 4a6db2a1..5df2009d 100644
--- a/src/lib/io/IStream.cpp
+++ b/src/lib/io/IStream.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/IStream.h b/src/lib/io/IStream.h
index eba56051..af3aeee5 100644
--- a/src/lib/io/IStream.h
+++ b/src/lib/io/IStream.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/IStreamFilterFactory.h b/src/lib/io/IStreamFilterFactory.h
index 77750747..c5af4dff 100644
--- a/src/lib/io/IStreamFilterFactory.h
+++ b/src/lib/io/IStreamFilterFactory.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/XIO.cpp b/src/lib/io/XIO.cpp
index ad0f6165..6ed9105f 100644
--- a/src/lib/io/XIO.cpp
+++ b/src/lib/io/XIO.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/io/XIO.h b/src/lib/io/XIO.h
index 9db729af..4525331f 100644
--- a/src/lib/io/XIO.h
+++ b/src/lib/io/XIO.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/ipc/CIpcClient.cpp b/src/lib/ipc/CIpcClient.cpp
index 836edc44..14faa5e9 100644
--- a/src/lib/ipc/CIpcClient.cpp
+++ b/src/lib/ipc/CIpcClient.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcClient.h b/src/lib/ipc/CIpcClient.h
index 73ae6ac1..623dd5d1 100644
--- a/src/lib/ipc/CIpcClient.h
+++ b/src/lib/ipc/CIpcClient.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcClientProxy.cpp b/src/lib/ipc/CIpcClientProxy.cpp
index 2b199169..5fd67821 100644
--- a/src/lib/ipc/CIpcClientProxy.cpp
+++ b/src/lib/ipc/CIpcClientProxy.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcClientProxy.h b/src/lib/ipc/CIpcClientProxy.h
index b15a05aa..1e0a9feb 100644
--- a/src/lib/ipc/CIpcClientProxy.h
+++ b/src/lib/ipc/CIpcClientProxy.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcLogOutputter.cpp b/src/lib/ipc/CIpcLogOutputter.cpp
index 51920eb2..59e35e3e 100644
--- a/src/lib/ipc/CIpcLogOutputter.cpp
+++ b/src/lib/ipc/CIpcLogOutputter.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcLogOutputter.h b/src/lib/ipc/CIpcLogOutputter.h
index 284e815b..e70dcf73 100644
--- a/src/lib/ipc/CIpcLogOutputter.h
+++ b/src/lib/ipc/CIpcLogOutputter.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcMessage.cpp b/src/lib/ipc/CIpcMessage.cpp
index ef34659b..f8913038 100644
--- a/src/lib/ipc/CIpcMessage.cpp
+++ b/src/lib/ipc/CIpcMessage.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcMessage.h b/src/lib/ipc/CIpcMessage.h
index 66f8c2cc..2f4f234a 100644
--- a/src/lib/ipc/CIpcMessage.h
+++ b/src/lib/ipc/CIpcMessage.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcServer.cpp b/src/lib/ipc/CIpcServer.cpp
index 77bca4a3..11715439 100644
--- a/src/lib/ipc/CIpcServer.cpp
+++ b/src/lib/ipc/CIpcServer.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcServer.h b/src/lib/ipc/CIpcServer.h
index 925ae8d0..cc738fef 100644
--- a/src/lib/ipc/CIpcServer.h
+++ b/src/lib/ipc/CIpcServer.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcServerProxy.cpp b/src/lib/ipc/CIpcServerProxy.cpp
index b942ea5d..047c4886 100644
--- a/src/lib/ipc/CIpcServerProxy.cpp
+++ b/src/lib/ipc/CIpcServerProxy.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CIpcServerProxy.h b/src/lib/ipc/CIpcServerProxy.h
index 7ec78a8d..8870bf1b 100644
--- a/src/lib/ipc/CIpcServerProxy.h
+++ b/src/lib/ipc/CIpcServerProxy.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/CMakeLists.txt b/src/lib/ipc/CMakeLists.txt
index 763a2975..40807d52 100644
--- a/src/lib/ipc/CMakeLists.txt
+++ b/src/lib/ipc/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/ipc/Ipc.cpp b/src/lib/ipc/Ipc.cpp
index a7ea138d..76d5a801 100644
--- a/src/lib/ipc/Ipc.cpp
+++ b/src/lib/ipc/Ipc.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/ipc/Ipc.h b/src/lib/ipc/Ipc.h
index c1233202..97552671 100644
--- a/src/lib/ipc/Ipc.h
+++ b/src/lib/ipc/Ipc.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/mt/CCondVar.cpp b/src/lib/mt/CCondVar.cpp
index 28fb9ae3..65102feb 100644
--- a/src/lib/mt/CCondVar.cpp
+++ b/src/lib/mt/CCondVar.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CCondVar.h b/src/lib/mt/CCondVar.h
index 0ed1f576..2c8062e8 100644
--- a/src/lib/mt/CCondVar.h
+++ b/src/lib/mt/CCondVar.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CLock.cpp b/src/lib/mt/CLock.cpp
index d4f1498c..bd5e0cee 100644
--- a/src/lib/mt/CLock.cpp
+++ b/src/lib/mt/CLock.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CLock.h b/src/lib/mt/CLock.h
index 445159e0..a96d59c4 100644
--- a/src/lib/mt/CLock.h
+++ b/src/lib/mt/CLock.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CMakeLists.txt b/src/lib/mt/CMakeLists.txt
index e42ee7d9..86913f77 100644
--- a/src/lib/mt/CMakeLists.txt
+++ b/src/lib/mt/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CMutex.cpp b/src/lib/mt/CMutex.cpp
index fe07b381..3aeb07b7 100644
--- a/src/lib/mt/CMutex.cpp
+++ b/src/lib/mt/CMutex.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CMutex.h b/src/lib/mt/CMutex.h
index 6976a583..93e732a9 100644
--- a/src/lib/mt/CMutex.h
+++ b/src/lib/mt/CMutex.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CThread.cpp b/src/lib/mt/CThread.cpp
index 23e5f0ff..9c22d5f2 100644
--- a/src/lib/mt/CThread.cpp
+++ b/src/lib/mt/CThread.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/CThread.h b/src/lib/mt/CThread.h
index b31cf623..28a01e01 100644
--- a/src/lib/mt/CThread.h
+++ b/src/lib/mt/CThread.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/XMT.cpp b/src/lib/mt/XMT.cpp
index d4259b74..91d18de2 100644
--- a/src/lib/mt/XMT.cpp
+++ b/src/lib/mt/XMT.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/XMT.h b/src/lib/mt/XMT.h
index 9b805c20..375efeca 100644
--- a/src/lib/mt/XMT.h
+++ b/src/lib/mt/XMT.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/mt/XThread.h b/src/lib/mt/XThread.h
index 47ec8283..b5fb2a4b 100644
--- a/src/lib/mt/XThread.h
+++ b/src/lib/mt/XThread.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CMakeLists.txt b/src/lib/net/CMakeLists.txt
index 5736a892..097bd727 100644
--- a/src/lib/net/CMakeLists.txt
+++ b/src/lib/net/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CNetworkAddress.cpp b/src/lib/net/CNetworkAddress.cpp
index 0bb2b30e..3e34fe0f 100644
--- a/src/lib/net/CNetworkAddress.cpp
+++ b/src/lib/net/CNetworkAddress.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CNetworkAddress.h b/src/lib/net/CNetworkAddress.h
index d78cc538..2fa430a3 100644
--- a/src/lib/net/CNetworkAddress.h
+++ b/src/lib/net/CNetworkAddress.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CSocketMultiplexer.cpp b/src/lib/net/CSocketMultiplexer.cpp
index 272a8cf6..27ee325e 100644
--- a/src/lib/net/CSocketMultiplexer.cpp
+++ b/src/lib/net/CSocketMultiplexer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CSocketMultiplexer.h b/src/lib/net/CSocketMultiplexer.h
index a92ace17..5f9b2320 100644
--- a/src/lib/net/CSocketMultiplexer.h
+++ b/src/lib/net/CSocketMultiplexer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CTCPListenSocket.cpp b/src/lib/net/CTCPListenSocket.cpp
index 3fe9d5aa..c609ba95 100644
--- a/src/lib/net/CTCPListenSocket.cpp
+++ b/src/lib/net/CTCPListenSocket.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CTCPListenSocket.h b/src/lib/net/CTCPListenSocket.h
index f0aa794a..52e65ae2 100644
--- a/src/lib/net/CTCPListenSocket.h
+++ b/src/lib/net/CTCPListenSocket.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CTCPSocket.cpp b/src/lib/net/CTCPSocket.cpp
index fb3e1833..ebc6667a 100644
--- a/src/lib/net/CTCPSocket.cpp
+++ b/src/lib/net/CTCPSocket.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CTCPSocket.h b/src/lib/net/CTCPSocket.h
index 17447e6e..9fc32991 100644
--- a/src/lib/net/CTCPSocket.h
+++ b/src/lib/net/CTCPSocket.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CTCPSocketFactory.cpp b/src/lib/net/CTCPSocketFactory.cpp
index 2833072b..9756a66f 100644
--- a/src/lib/net/CTCPSocketFactory.cpp
+++ b/src/lib/net/CTCPSocketFactory.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/CTCPSocketFactory.h b/src/lib/net/CTCPSocketFactory.h
index 302ee423..7eb53a13 100644
--- a/src/lib/net/CTCPSocketFactory.h
+++ b/src/lib/net/CTCPSocketFactory.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/IDataSocket.cpp b/src/lib/net/IDataSocket.cpp
index 0fe37af4..b9fa07a9 100644
--- a/src/lib/net/IDataSocket.cpp
+++ b/src/lib/net/IDataSocket.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/IDataSocket.h b/src/lib/net/IDataSocket.h
index 1aa5c897..fc85a73b 100644
--- a/src/lib/net/IDataSocket.h
+++ b/src/lib/net/IDataSocket.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/IListenSocket.cpp b/src/lib/net/IListenSocket.cpp
index 97683081..3c727100 100644
--- a/src/lib/net/IListenSocket.cpp
+++ b/src/lib/net/IListenSocket.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/IListenSocket.h b/src/lib/net/IListenSocket.h
index b68b9af0..d5a44b72 100644
--- a/src/lib/net/IListenSocket.h
+++ b/src/lib/net/IListenSocket.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/ISocket.cpp b/src/lib/net/ISocket.cpp
index 5ca90451..8e7fe494 100644
--- a/src/lib/net/ISocket.cpp
+++ b/src/lib/net/ISocket.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/ISocket.h b/src/lib/net/ISocket.h
index 8891240d..7b49959c 100644
--- a/src/lib/net/ISocket.h
+++ b/src/lib/net/ISocket.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/ISocketFactory.h b/src/lib/net/ISocketFactory.h
index 2d9625fb..ede3a175 100644
--- a/src/lib/net/ISocketFactory.h
+++ b/src/lib/net/ISocketFactory.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/ISocketMultiplexerJob.h b/src/lib/net/ISocketMultiplexerJob.h
index d62cefe5..cf0dfc72 100644
--- a/src/lib/net/ISocketMultiplexerJob.h
+++ b/src/lib/net/ISocketMultiplexerJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/TSocketMultiplexerMethodJob.h b/src/lib/net/TSocketMultiplexerMethodJob.h
index b1e28d48..b1c0e35e 100644
--- a/src/lib/net/TSocketMultiplexerMethodJob.h
+++ b/src/lib/net/TSocketMultiplexerMethodJob.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/XSocket.cpp b/src/lib/net/XSocket.cpp
index 1fbb94f2..1705b647 100644
--- a/src/lib/net/XSocket.cpp
+++ b/src/lib/net/XSocket.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/net/XSocket.h b/src/lib/net/XSocket.h
index ca7ac80b..fa32d263 100644
--- a/src/lib/net/XSocket.h
+++ b/src/lib/net/XSocket.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboard.cpp b/src/lib/platform/CMSWindowsClipboard.cpp
index 8fd41344..dbbb0682 100644
--- a/src/lib/platform/CMSWindowsClipboard.cpp
+++ b/src/lib/platform/CMSWindowsClipboard.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboard.h b/src/lib/platform/CMSWindowsClipboard.h
index 1918599b..ba23aea0 100644
--- a/src/lib/platform/CMSWindowsClipboard.h
+++ b/src/lib/platform/CMSWindowsClipboard.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp b/src/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp
index c0d0e9ce..a468887b 100644
--- a/src/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp
+++ b/src/lib/platform/CMSWindowsClipboardAnyTextConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardAnyTextConverter.h b/src/lib/platform/CMSWindowsClipboardAnyTextConverter.h
index c2802127..b5c66a4c 100644
--- a/src/lib/platform/CMSWindowsClipboardAnyTextConverter.h
+++ b/src/lib/platform/CMSWindowsClipboardAnyTextConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardBitmapConverter.cpp b/src/lib/platform/CMSWindowsClipboardBitmapConverter.cpp
index 98345ab9..c37672ee 100644
--- a/src/lib/platform/CMSWindowsClipboardBitmapConverter.cpp
+++ b/src/lib/platform/CMSWindowsClipboardBitmapConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardBitmapConverter.h b/src/lib/platform/CMSWindowsClipboardBitmapConverter.h
index cf435bf9..93be140d 100644
--- a/src/lib/platform/CMSWindowsClipboardBitmapConverter.h
+++ b/src/lib/platform/CMSWindowsClipboardBitmapConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardFacade.cpp b/src/lib/platform/CMSWindowsClipboardFacade.cpp
index 0639b9bf..daa7437d 100644
--- a/src/lib/platform/CMSWindowsClipboardFacade.cpp
+++ b/src/lib/platform/CMSWindowsClipboardFacade.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardFacade.h b/src/lib/platform/CMSWindowsClipboardFacade.h
index db21e1bc..5ad95d12 100644
--- a/src/lib/platform/CMSWindowsClipboardFacade.h
+++ b/src/lib/platform/CMSWindowsClipboardFacade.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardHTMLConverter.cpp b/src/lib/platform/CMSWindowsClipboardHTMLConverter.cpp
index 278755d1..660a5361 100644
--- a/src/lib/platform/CMSWindowsClipboardHTMLConverter.cpp
+++ b/src/lib/platform/CMSWindowsClipboardHTMLConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardHTMLConverter.h b/src/lib/platform/CMSWindowsClipboardHTMLConverter.h
index 0a58f369..d5d7a53e 100644
--- a/src/lib/platform/CMSWindowsClipboardHTMLConverter.h
+++ b/src/lib/platform/CMSWindowsClipboardHTMLConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardTextConverter.cpp b/src/lib/platform/CMSWindowsClipboardTextConverter.cpp
index d0d7a4bd..0e83bbee 100644
--- a/src/lib/platform/CMSWindowsClipboardTextConverter.cpp
+++ b/src/lib/platform/CMSWindowsClipboardTextConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardTextConverter.h b/src/lib/platform/CMSWindowsClipboardTextConverter.h
index 0ecb3fb8..e4649aa4 100644
--- a/src/lib/platform/CMSWindowsClipboardTextConverter.h
+++ b/src/lib/platform/CMSWindowsClipboardTextConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardUTF16Converter.cpp b/src/lib/platform/CMSWindowsClipboardUTF16Converter.cpp
index 46fd42b2..aee17775 100644
--- a/src/lib/platform/CMSWindowsClipboardUTF16Converter.cpp
+++ b/src/lib/platform/CMSWindowsClipboardUTF16Converter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsClipboardUTF16Converter.h b/src/lib/platform/CMSWindowsClipboardUTF16Converter.h
index 2b7a15e7..fbfa9906 100644
--- a/src/lib/platform/CMSWindowsClipboardUTF16Converter.h
+++ b/src/lib/platform/CMSWindowsClipboardUTF16Converter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsDebugOutputter.cpp b/src/lib/platform/CMSWindowsDebugOutputter.cpp
index 571d0ed5..85921cae 100644
--- a/src/lib/platform/CMSWindowsDebugOutputter.cpp
+++ b/src/lib/platform/CMSWindowsDebugOutputter.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/platform/CMSWindowsDebugOutputter.h b/src/lib/platform/CMSWindowsDebugOutputter.h
index caadc416..aaf08117 100644
--- a/src/lib/platform/CMSWindowsDebugOutputter.h
+++ b/src/lib/platform/CMSWindowsDebugOutputter.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/platform/CMSWindowsDesks.cpp b/src/lib/platform/CMSWindowsDesks.cpp
index 9b3f255a..4bf3ee1b 100644
--- a/src/lib/platform/CMSWindowsDesks.cpp
+++ b/src/lib/platform/CMSWindowsDesks.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsDesks.h b/src/lib/platform/CMSWindowsDesks.h
index 86791fa4..86624b08 100644
--- a/src/lib/platform/CMSWindowsDesks.h
+++ b/src/lib/platform/CMSWindowsDesks.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsEventQueueBuffer.cpp b/src/lib/platform/CMSWindowsEventQueueBuffer.cpp
index 4f64deb3..ee6039bc 100644
--- a/src/lib/platform/CMSWindowsEventQueueBuffer.cpp
+++ b/src/lib/platform/CMSWindowsEventQueueBuffer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsEventQueueBuffer.h b/src/lib/platform/CMSWindowsEventQueueBuffer.h
index b1b42851..d0674580 100644
--- a/src/lib/platform/CMSWindowsEventQueueBuffer.h
+++ b/src/lib/platform/CMSWindowsEventQueueBuffer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsHookLibraryLoader.cpp b/src/lib/platform/CMSWindowsHookLibraryLoader.cpp
index 54a3e84f..1f9aecb0 100644
--- a/src/lib/platform/CMSWindowsHookLibraryLoader.cpp
+++ b/src/lib/platform/CMSWindowsHookLibraryLoader.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsHookLibraryLoader.h b/src/lib/platform/CMSWindowsHookLibraryLoader.h
index e37fd6e0..884277b3 100644
--- a/src/lib/platform/CMSWindowsHookLibraryLoader.h
+++ b/src/lib/platform/CMSWindowsHookLibraryLoader.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsKeyState.cpp b/src/lib/platform/CMSWindowsKeyState.cpp
index 6b954bfb..3d8ddf3f 100644
--- a/src/lib/platform/CMSWindowsKeyState.cpp
+++ b/src/lib/platform/CMSWindowsKeyState.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsKeyState.h b/src/lib/platform/CMSWindowsKeyState.h
index ee57474d..98859fc5 100644
--- a/src/lib/platform/CMSWindowsKeyState.h
+++ b/src/lib/platform/CMSWindowsKeyState.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsRelauncher.cpp b/src/lib/platform/CMSWindowsRelauncher.cpp
index 61a57232..84fc181d 100644
--- a/src/lib/platform/CMSWindowsRelauncher.cpp
+++ b/src/lib/platform/CMSWindowsRelauncher.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2009 Chris Schoeneman
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsRelauncher.h b/src/lib/platform/CMSWindowsRelauncher.h
index 259ef945..435df275 100644
--- a/src/lib/platform/CMSWindowsRelauncher.h
+++ b/src/lib/platform/CMSWindowsRelauncher.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2009 Chris Schoeneman
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsScreen.cpp b/src/lib/platform/CMSWindowsScreen.cpp
index 12c725d7..1dda9266 100644
--- a/src/lib/platform/CMSWindowsScreen.cpp
+++ b/src/lib/platform/CMSWindowsScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsScreen.h b/src/lib/platform/CMSWindowsScreen.h
index 6039baaf..2b11d3a8 100644
--- a/src/lib/platform/CMSWindowsScreen.h
+++ b/src/lib/platform/CMSWindowsScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsScreenSaver.cpp b/src/lib/platform/CMSWindowsScreenSaver.cpp
index 4f2a488f..7086cafb 100644
--- a/src/lib/platform/CMSWindowsScreenSaver.cpp
+++ b/src/lib/platform/CMSWindowsScreenSaver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsScreenSaver.h b/src/lib/platform/CMSWindowsScreenSaver.h
index 741108d6..73074644 100644
--- a/src/lib/platform/CMSWindowsScreenSaver.h
+++ b/src/lib/platform/CMSWindowsScreenSaver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsUtil.cpp b/src/lib/platform/CMSWindowsUtil.cpp
index 2471c13c..61876a27 100644
--- a/src/lib/platform/CMSWindowsUtil.cpp
+++ b/src/lib/platform/CMSWindowsUtil.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsUtil.h b/src/lib/platform/CMSWindowsUtil.h
index 7f4e9291..d233db6a 100644
--- a/src/lib/platform/CMSWindowsUtil.h
+++ b/src/lib/platform/CMSWindowsUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CMSWindowsXInput.cpp b/src/lib/platform/CMSWindowsXInput.cpp
index b2d2051c..0e0297c4 100644
--- a/src/lib/platform/CMSWindowsXInput.cpp
+++ b/src/lib/platform/CMSWindowsXInput.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/platform/CMSWindowsXInput.h b/src/lib/platform/CMSWindowsXInput.h
index 92f0138d..5ef65e05 100644
--- a/src/lib/platform/CMSWindowsXInput.h
+++ b/src/lib/platform/CMSWindowsXInput.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index e5946677..e44eb189 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboard.cpp b/src/lib/platform/COSXClipboard.cpp
index fc04bac0..a8f4cac3 100644
--- a/src/lib/platform/COSXClipboard.cpp
+++ b/src/lib/platform/COSXClipboard.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboard.h b/src/lib/platform/COSXClipboard.h
index 1f4aeb33..069b7c84 100644
--- a/src/lib/platform/COSXClipboard.h
+++ b/src/lib/platform/COSXClipboard.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboardAnyTextConverter.cpp b/src/lib/platform/COSXClipboardAnyTextConverter.cpp
index fcf55ea5..7c0fb5da 100644
--- a/src/lib/platform/COSXClipboardAnyTextConverter.cpp
+++ b/src/lib/platform/COSXClipboardAnyTextConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboardAnyTextConverter.h b/src/lib/platform/COSXClipboardAnyTextConverter.h
index 487801c7..35cdb1ae 100644
--- a/src/lib/platform/COSXClipboardAnyTextConverter.h
+++ b/src/lib/platform/COSXClipboardAnyTextConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboardTextConverter.cpp b/src/lib/platform/COSXClipboardTextConverter.cpp
index bd9956b3..ef60d3cd 100644
--- a/src/lib/platform/COSXClipboardTextConverter.cpp
+++ b/src/lib/platform/COSXClipboardTextConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboardTextConverter.h b/src/lib/platform/COSXClipboardTextConverter.h
index aedf743d..68c3e534 100644
--- a/src/lib/platform/COSXClipboardTextConverter.h
+++ b/src/lib/platform/COSXClipboardTextConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboardUTF16Converter.cpp b/src/lib/platform/COSXClipboardUTF16Converter.cpp
index 06e688a5..f7a052ae 100644
--- a/src/lib/platform/COSXClipboardUTF16Converter.cpp
+++ b/src/lib/platform/COSXClipboardUTF16Converter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXClipboardUTF16Converter.h b/src/lib/platform/COSXClipboardUTF16Converter.h
index 833a90da..09b5f5c2 100644
--- a/src/lib/platform/COSXClipboardUTF16Converter.h
+++ b/src/lib/platform/COSXClipboardUTF16Converter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXEventQueueBuffer.cpp b/src/lib/platform/COSXEventQueueBuffer.cpp
index 64b4e226..7167d147 100644
--- a/src/lib/platform/COSXEventQueueBuffer.cpp
+++ b/src/lib/platform/COSXEventQueueBuffer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXEventQueueBuffer.h b/src/lib/platform/COSXEventQueueBuffer.h
index b03afb32..055e7a59 100644
--- a/src/lib/platform/COSXEventQueueBuffer.h
+++ b/src/lib/platform/COSXEventQueueBuffer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXKeyState.cpp b/src/lib/platform/COSXKeyState.cpp
index 0f1841b3..812f95c8 100644
--- a/src/lib/platform/COSXKeyState.cpp
+++ b/src/lib/platform/COSXKeyState.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXKeyState.h b/src/lib/platform/COSXKeyState.h
index 0d90b1a0..dffc51a3 100644
--- a/src/lib/platform/COSXKeyState.h
+++ b/src/lib/platform/COSXKeyState.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXScreen.cpp b/src/lib/platform/COSXScreen.cpp
index 536a7fc2..b97158f3 100644
--- a/src/lib/platform/COSXScreen.cpp
+++ b/src/lib/platform/COSXScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXScreen.h b/src/lib/platform/COSXScreen.h
index e90bb533..cb2017c4 100644
--- a/src/lib/platform/COSXScreen.h
+++ b/src/lib/platform/COSXScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXScreenSaver.cpp b/src/lib/platform/COSXScreenSaver.cpp
index a4457fe9..a3a4fe80 100644
--- a/src/lib/platform/COSXScreenSaver.cpp
+++ b/src/lib/platform/COSXScreenSaver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXScreenSaver.h b/src/lib/platform/COSXScreenSaver.h
index 331f1c42..04081fb6 100644
--- a/src/lib/platform/COSXScreenSaver.h
+++ b/src/lib/platform/COSXScreenSaver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/COSXScreenSaverUtil.h b/src/lib/platform/COSXScreenSaverUtil.h
index 019615e4..0286ac55 100644
--- a/src/lib/platform/COSXScreenSaverUtil.h
+++ b/src/lib/platform/COSXScreenSaverUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CSynergyHook.cpp b/src/lib/platform/CSynergyHook.cpp
index 70a499da..9e195416 100644
--- a/src/lib/platform/CSynergyHook.cpp
+++ b/src/lib/platform/CSynergyHook.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CSynergyHook.h b/src/lib/platform/CSynergyHook.h
index 5d2fafb2..ba83eea6 100644
--- a/src/lib/platform/CSynergyHook.h
+++ b/src/lib/platform/CSynergyHook.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboard.cpp b/src/lib/platform/CXWindowsClipboard.cpp
index bf98fc9a..f62da932 100644
--- a/src/lib/platform/CXWindowsClipboard.cpp
+++ b/src/lib/platform/CXWindowsClipboard.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboard.h b/src/lib/platform/CXWindowsClipboard.h
index edb431ab..b8944d5d 100644
--- a/src/lib/platform/CXWindowsClipboard.h
+++ b/src/lib/platform/CXWindowsClipboard.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp b/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp
index d0511703..411ceb04 100644
--- a/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp
+++ b/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.h b/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.h
index 97887245..1305b1d4 100644
--- a/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.h
+++ b/src/lib/platform/CXWindowsClipboardAnyBitmapConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardBMPConverter.cpp b/src/lib/platform/CXWindowsClipboardBMPConverter.cpp
index 26707607..26d00dba 100644
--- a/src/lib/platform/CXWindowsClipboardBMPConverter.cpp
+++ b/src/lib/platform/CXWindowsClipboardBMPConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardBMPConverter.h b/src/lib/platform/CXWindowsClipboardBMPConverter.h
index 881ab467..0c57bfff 100644
--- a/src/lib/platform/CXWindowsClipboardBMPConverter.h
+++ b/src/lib/platform/CXWindowsClipboardBMPConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardHTMLConverter.cpp b/src/lib/platform/CXWindowsClipboardHTMLConverter.cpp
index fa0886fd..43d53a35 100644
--- a/src/lib/platform/CXWindowsClipboardHTMLConverter.cpp
+++ b/src/lib/platform/CXWindowsClipboardHTMLConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardHTMLConverter.h b/src/lib/platform/CXWindowsClipboardHTMLConverter.h
index d83e3f4d..c8179876 100644
--- a/src/lib/platform/CXWindowsClipboardHTMLConverter.h
+++ b/src/lib/platform/CXWindowsClipboardHTMLConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardTextConverter.cpp b/src/lib/platform/CXWindowsClipboardTextConverter.cpp
index 10a03bfd..8a9de008 100644
--- a/src/lib/platform/CXWindowsClipboardTextConverter.cpp
+++ b/src/lib/platform/CXWindowsClipboardTextConverter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardTextConverter.h b/src/lib/platform/CXWindowsClipboardTextConverter.h
index 43455d1d..9a316868 100644
--- a/src/lib/platform/CXWindowsClipboardTextConverter.h
+++ b/src/lib/platform/CXWindowsClipboardTextConverter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardUCS2Converter.cpp b/src/lib/platform/CXWindowsClipboardUCS2Converter.cpp
index 554cd130..8f5985de 100644
--- a/src/lib/platform/CXWindowsClipboardUCS2Converter.cpp
+++ b/src/lib/platform/CXWindowsClipboardUCS2Converter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardUCS2Converter.h b/src/lib/platform/CXWindowsClipboardUCS2Converter.h
index 47f4cba6..2ea4eab5 100644
--- a/src/lib/platform/CXWindowsClipboardUCS2Converter.h
+++ b/src/lib/platform/CXWindowsClipboardUCS2Converter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardUTF8Converter.cpp b/src/lib/platform/CXWindowsClipboardUTF8Converter.cpp
index 30263d8f..47f64698 100644
--- a/src/lib/platform/CXWindowsClipboardUTF8Converter.cpp
+++ b/src/lib/platform/CXWindowsClipboardUTF8Converter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsClipboardUTF8Converter.h b/src/lib/platform/CXWindowsClipboardUTF8Converter.h
index e6ba1588..b224c55f 100644
--- a/src/lib/platform/CXWindowsClipboardUTF8Converter.h
+++ b/src/lib/platform/CXWindowsClipboardUTF8Converter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsEventQueueBuffer.cpp b/src/lib/platform/CXWindowsEventQueueBuffer.cpp
index eb0a8ae5..507b2b03 100644
--- a/src/lib/platform/CXWindowsEventQueueBuffer.cpp
+++ b/src/lib/platform/CXWindowsEventQueueBuffer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsEventQueueBuffer.h b/src/lib/platform/CXWindowsEventQueueBuffer.h
index a1d5d4be..116eca5e 100644
--- a/src/lib/platform/CXWindowsEventQueueBuffer.h
+++ b/src/lib/platform/CXWindowsEventQueueBuffer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsKeyState.cpp b/src/lib/platform/CXWindowsKeyState.cpp
index 2956f440..1b0d088f 100644
--- a/src/lib/platform/CXWindowsKeyState.cpp
+++ b/src/lib/platform/CXWindowsKeyState.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsKeyState.h b/src/lib/platform/CXWindowsKeyState.h
index 37a5d082..c2d84656 100644
--- a/src/lib/platform/CXWindowsKeyState.h
+++ b/src/lib/platform/CXWindowsKeyState.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsScreen.cpp b/src/lib/platform/CXWindowsScreen.cpp
index e17e6ded..c6d82769 100644
--- a/src/lib/platform/CXWindowsScreen.cpp
+++ b/src/lib/platform/CXWindowsScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsScreen.h b/src/lib/platform/CXWindowsScreen.h
index a71193b8..5251c4de 100644
--- a/src/lib/platform/CXWindowsScreen.h
+++ b/src/lib/platform/CXWindowsScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsScreenSaver.cpp b/src/lib/platform/CXWindowsScreenSaver.cpp
index 56ace48a..39c8e13d 100644
--- a/src/lib/platform/CXWindowsScreenSaver.cpp
+++ b/src/lib/platform/CXWindowsScreenSaver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsScreenSaver.h b/src/lib/platform/CXWindowsScreenSaver.h
index 3326f243..32008174 100644
--- a/src/lib/platform/CXWindowsScreenSaver.h
+++ b/src/lib/platform/CXWindowsScreenSaver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsUtil.cpp b/src/lib/platform/CXWindowsUtil.cpp
index 0317a407..3b8244bf 100644
--- a/src/lib/platform/CXWindowsUtil.cpp
+++ b/src/lib/platform/CXWindowsUtil.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/CXWindowsUtil.h b/src/lib/platform/CXWindowsUtil.h
index 150972ad..c7ae9baf 100644
--- a/src/lib/platform/CXWindowsUtil.h
+++ b/src/lib/platform/CXWindowsUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/HookDLL.cpp b/src/lib/platform/HookDLL.cpp
index c266ca95..3818cfdc 100644
--- a/src/lib/platform/HookDLL.cpp
+++ b/src/lib/platform/HookDLL.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/HookDLL.h b/src/lib/platform/HookDLL.h
index 0f59eac9..ded57198 100644
--- a/src/lib/platform/HookDLL.h
+++ b/src/lib/platform/HookDLL.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/IMSWindowsClipboardFacade.h b/src/lib/platform/IMSWindowsClipboardFacade.h
index 23202f10..1c260315 100644
--- a/src/lib/platform/IMSWindowsClipboardFacade.h
+++ b/src/lib/platform/IMSWindowsClipboardFacade.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/OSXScreenSaverControl.h b/src/lib/platform/OSXScreenSaverControl.h
index fa2d99e0..7d8ed3e7 100644
--- a/src/lib/platform/OSXScreenSaverControl.h
+++ b/src/lib/platform/OSXScreenSaverControl.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2009 Chris Schoeneman
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/XInput13.h b/src/lib/platform/XInput13.h
index dfeffdd2..ee434893 100644
--- a/src/lib/platform/XInput13.h
+++ b/src/lib/platform/XInput13.h
@@ -3,6 +3,7 @@
 *   XInput.h -- This module defines XBOX controller APIs                   *
 *               and constansts for the Windows platform.                   *
 *                                                                          *
+*   Copyright (C) 2012 Bolton Software Ltd.
 *   Copyright (c) Microsoft Corp. All rights reserved.                     *
 *                                                                          *
 ***************************************************************************/
diff --git a/src/lib/platform/XInputHook.cpp b/src/lib/platform/XInputHook.cpp
index 9a0ca1ba..f606d4ac 100644
--- a/src/lib/platform/XInputHook.cpp
+++ b/src/lib/platform/XInputHook.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/XInputHook.h b/src/lib/platform/XInputHook.h
index 1a10cc5e..eb98c29e 100644
--- a/src/lib/platform/XInputHook.h
+++ b/src/lib/platform/XInputHook.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/XInputProxy13.cpp b/src/lib/platform/XInputProxy13.cpp
index 1a864cee..ab1cb79d 100644
--- a/src/lib/platform/XInputProxy13.cpp
+++ b/src/lib/platform/XInputProxy13.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/platform/XInputProxy13.h b/src/lib/platform/XInputProxy13.h
index 1b96cb73..7e585635 100644
--- a/src/lib/platform/XInputProxy13.h
+++ b/src/lib/platform/XInputProxy13.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CBaseClientProxy.cpp b/src/lib/server/CBaseClientProxy.cpp
index f23cc6be..0ab4e3ce 100644
--- a/src/lib/server/CBaseClientProxy.cpp
+++ b/src/lib/server/CBaseClientProxy.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2006 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CBaseClientProxy.h b/src/lib/server/CBaseClientProxy.h
index 4ad2e6a2..42441e56 100644
--- a/src/lib/server/CBaseClientProxy.h
+++ b/src/lib/server/CBaseClientProxy.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientListener.cpp b/src/lib/server/CClientListener.cpp
index d4718f1d..571bad8e 100644
--- a/src/lib/server/CClientListener.cpp
+++ b/src/lib/server/CClientListener.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientListener.h b/src/lib/server/CClientListener.h
index 4a0bf676..3ad8fa24 100644
--- a/src/lib/server/CClientListener.h
+++ b/src/lib/server/CClientListener.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy.cpp b/src/lib/server/CClientProxy.cpp
index e923f8fe..69320239 100644
--- a/src/lib/server/CClientProxy.cpp
+++ b/src/lib/server/CClientProxy.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy.h b/src/lib/server/CClientProxy.h
index b7f9a6ba..82b2c846 100644
--- a/src/lib/server/CClientProxy.h
+++ b/src/lib/server/CClientProxy.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_0.cpp b/src/lib/server/CClientProxy1_0.cpp
index 4412328f..ea467483 100644
--- a/src/lib/server/CClientProxy1_0.cpp
+++ b/src/lib/server/CClientProxy1_0.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_0.h b/src/lib/server/CClientProxy1_0.h
index 94595060..2b66e0dd 100644
--- a/src/lib/server/CClientProxy1_0.h
+++ b/src/lib/server/CClientProxy1_0.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_1.cpp b/src/lib/server/CClientProxy1_1.cpp
index d4ef1fe0..377a3f74 100644
--- a/src/lib/server/CClientProxy1_1.cpp
+++ b/src/lib/server/CClientProxy1_1.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_1.h b/src/lib/server/CClientProxy1_1.h
index a8b52856..2118694b 100644
--- a/src/lib/server/CClientProxy1_1.h
+++ b/src/lib/server/CClientProxy1_1.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_2.cpp b/src/lib/server/CClientProxy1_2.cpp
index 96a21e97..7e6de36c 100644
--- a/src/lib/server/CClientProxy1_2.cpp
+++ b/src/lib/server/CClientProxy1_2.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_2.h b/src/lib/server/CClientProxy1_2.h
index 57991f14..a89d5491 100644
--- a/src/lib/server/CClientProxy1_2.h
+++ b/src/lib/server/CClientProxy1_2.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_3.cpp b/src/lib/server/CClientProxy1_3.cpp
index 4406576d..74002faf 100644
--- a/src/lib/server/CClientProxy1_3.cpp
+++ b/src/lib/server/CClientProxy1_3.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2006 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_3.h b/src/lib/server/CClientProxy1_3.h
index 7bcb5e7d..fc5e6ab0 100644
--- a/src/lib/server/CClientProxy1_3.h
+++ b/src/lib/server/CClientProxy1_3.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2006 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2006 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_4.cpp b/src/lib/server/CClientProxy1_4.cpp
index a36d3c2a..ccbc7418 100644
--- a/src/lib/server/CClientProxy1_4.cpp
+++ b/src/lib/server/CClientProxy1_4.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxy1_4.h b/src/lib/server/CClientProxy1_4.h
index 44d3ac95..2701ddc6 100644
--- a/src/lib/server/CClientProxy1_4.h
+++ b/src/lib/server/CClientProxy1_4.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxyUnknown.cpp b/src/lib/server/CClientProxyUnknown.cpp
index 2732d868..cbdc4b79 100644
--- a/src/lib/server/CClientProxyUnknown.cpp
+++ b/src/lib/server/CClientProxyUnknown.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CClientProxyUnknown.h b/src/lib/server/CClientProxyUnknown.h
index 23387c96..bf9dabf1 100644
--- a/src/lib/server/CClientProxyUnknown.h
+++ b/src/lib/server/CClientProxyUnknown.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CConfig.cpp b/src/lib/server/CConfig.cpp
index deb2cf49..7b17b163 100644
--- a/src/lib/server/CConfig.cpp
+++ b/src/lib/server/CConfig.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CConfig.h b/src/lib/server/CConfig.h
index 32add041..c02514af 100644
--- a/src/lib/server/CConfig.h
+++ b/src/lib/server/CConfig.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CInputFilter.cpp b/src/lib/server/CInputFilter.cpp
index ace55657..b3b3419b 100644
--- a/src/lib/server/CInputFilter.cpp
+++ b/src/lib/server/CInputFilter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2005 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CInputFilter.h b/src/lib/server/CInputFilter.h
index 066ad4d4..b3f9ebb0 100644
--- a/src/lib/server/CInputFilter.h
+++ b/src/lib/server/CInputFilter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2005 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
index b62aae37..818c9061 100644
--- a/src/lib/server/CMakeLists.txt
+++ b/src/lib/server/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CPrimaryClient.cpp b/src/lib/server/CPrimaryClient.cpp
index 1a2d88ae..410d88a2 100644
--- a/src/lib/server/CPrimaryClient.cpp
+++ b/src/lib/server/CPrimaryClient.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CPrimaryClient.h b/src/lib/server/CPrimaryClient.h
index d7492426..30ede0df 100644
--- a/src/lib/server/CPrimaryClient.h
+++ b/src/lib/server/CPrimaryClient.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CServer.cpp b/src/lib/server/CServer.cpp
index 6257eb65..ddd8422b 100644
--- a/src/lib/server/CServer.cpp
+++ b/src/lib/server/CServer.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/server/CServer.h b/src/lib/server/CServer.h
index 8f7bb67b..aba54442 100644
--- a/src/lib/server/CServer.h
+++ b/src/lib/server/CServer.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CApp.cpp b/src/lib/synergy/CApp.cpp
index 5f1ae5ed..a02e47f0 100644
--- a/src/lib/synergy/CApp.cpp
+++ b/src/lib/synergy/CApp.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CApp.h b/src/lib/synergy/CApp.h
index c3929248..0587a302 100644
--- a/src/lib/synergy/CApp.h
+++ b/src/lib/synergy/CApp.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CAppUtil.cpp b/src/lib/synergy/CAppUtil.cpp
index 1365e857..3271abc5 100644
--- a/src/lib/synergy/CAppUtil.cpp
+++ b/src/lib/synergy/CAppUtil.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CAppUtil.h b/src/lib/synergy/CAppUtil.h
index f6e1ddb1..566cfe78 100644
--- a/src/lib/synergy/CAppUtil.h
+++ b/src/lib/synergy/CAppUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CAppUtilUnix.cpp b/src/lib/synergy/CAppUtilUnix.cpp
index b0884c5f..c287b1c7 100644
--- a/src/lib/synergy/CAppUtilUnix.cpp
+++ b/src/lib/synergy/CAppUtilUnix.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CAppUtilUnix.h b/src/lib/synergy/CAppUtilUnix.h
index 297c1b44..c69d8d11 100644
--- a/src/lib/synergy/CAppUtilUnix.h
+++ b/src/lib/synergy/CAppUtilUnix.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CAppUtilWindows.cpp b/src/lib/synergy/CAppUtilWindows.cpp
index de4a8024..309f6637 100644
--- a/src/lib/synergy/CAppUtilWindows.cpp
+++ b/src/lib/synergy/CAppUtilWindows.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CAppUtilWindows.h b/src/lib/synergy/CAppUtilWindows.h
index cf5cecaf..f8977ed8 100644
--- a/src/lib/synergy/CAppUtilWindows.h
+++ b/src/lib/synergy/CAppUtilWindows.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CArgsBase.cpp b/src/lib/synergy/CArgsBase.cpp
index 31d39279..5a099048 100644
--- a/src/lib/synergy/CArgsBase.cpp
+++ b/src/lib/synergy/CArgsBase.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CArgsBase.h b/src/lib/synergy/CArgsBase.h
index 7db782d5..c9df0a4b 100644
--- a/src/lib/synergy/CArgsBase.h
+++ b/src/lib/synergy/CArgsBase.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CClientApp.cpp b/src/lib/synergy/CClientApp.cpp
index 89666c66..1ce392ee 100644
--- a/src/lib/synergy/CClientApp.cpp
+++ b/src/lib/synergy/CClientApp.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CClientApp.h b/src/lib/synergy/CClientApp.h
index 09aeec8e..ba7d96ec 100644
--- a/src/lib/synergy/CClientApp.h
+++ b/src/lib/synergy/CClientApp.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CClientTaskBarReceiver.cpp b/src/lib/synergy/CClientTaskBarReceiver.cpp
index 8f12b079..53c15606 100644
--- a/src/lib/synergy/CClientTaskBarReceiver.cpp
+++ b/src/lib/synergy/CClientTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CClientTaskBarReceiver.h b/src/lib/synergy/CClientTaskBarReceiver.h
index 03416f71..b244ce5c 100644
--- a/src/lib/synergy/CClientTaskBarReceiver.h
+++ b/src/lib/synergy/CClientTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CClipboard.cpp b/src/lib/synergy/CClipboard.cpp
index 9469f0cc..8ffe1d39 100644
--- a/src/lib/synergy/CClipboard.cpp
+++ b/src/lib/synergy/CClipboard.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CClipboard.h b/src/lib/synergy/CClipboard.h
index cdc14d31..de65a30e 100644
--- a/src/lib/synergy/CClipboard.h
+++ b/src/lib/synergy/CClipboard.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CDaemonApp.cpp b/src/lib/synergy/CDaemonApp.cpp
index 4a757a73..d7edc7bc 100644
--- a/src/lib/synergy/CDaemonApp.cpp
+++ b/src/lib/synergy/CDaemonApp.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CDaemonApp.h b/src/lib/synergy/CDaemonApp.h
index 55561180..cf212583 100644
--- a/src/lib/synergy/CDaemonApp.h
+++ b/src/lib/synergy/CDaemonApp.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CEventGameDevice.cpp b/src/lib/synergy/CEventGameDevice.cpp
index 82de89e2..44dd1387 100644
--- a/src/lib/synergy/CEventGameDevice.cpp
+++ b/src/lib/synergy/CEventGameDevice.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CEventGameDevice.h b/src/lib/synergy/CEventGameDevice.h
index 700b2035..757fad18 100644
--- a/src/lib/synergy/CEventGameDevice.h
+++ b/src/lib/synergy/CEventGameDevice.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CGameDevice.cpp b/src/lib/synergy/CGameDevice.cpp
index 3a42b5e9..a0563fd7 100644
--- a/src/lib/synergy/CGameDevice.cpp
+++ b/src/lib/synergy/CGameDevice.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CGameDevice.h b/src/lib/synergy/CGameDevice.h
index 1f47d58b..14602b59 100644
--- a/src/lib/synergy/CGameDevice.h
+++ b/src/lib/synergy/CGameDevice.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CKeyMap.cpp b/src/lib/synergy/CKeyMap.cpp
index 8683ad9a..63f36efa 100644
--- a/src/lib/synergy/CKeyMap.cpp
+++ b/src/lib/synergy/CKeyMap.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2005 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CKeyMap.h b/src/lib/synergy/CKeyMap.h
index de5961fe..b024602b 100644
--- a/src/lib/synergy/CKeyMap.h
+++ b/src/lib/synergy/CKeyMap.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2005 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2005 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CKeyState.cpp b/src/lib/synergy/CKeyState.cpp
index d56f6aaa..7141927f 100644
--- a/src/lib/synergy/CKeyState.cpp
+++ b/src/lib/synergy/CKeyState.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CKeyState.h b/src/lib/synergy/CKeyState.h
index bc6d2e69..078221b6 100644
--- a/src/lib/synergy/CKeyState.h
+++ b/src/lib/synergy/CKeyState.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
index 76c5e600..637541ab 100644
--- a/src/lib/synergy/CMakeLists.txt
+++ b/src/lib/synergy/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CPacketStreamFilter.cpp b/src/lib/synergy/CPacketStreamFilter.cpp
index 10b5d734..60dba733 100644
--- a/src/lib/synergy/CPacketStreamFilter.cpp
+++ b/src/lib/synergy/CPacketStreamFilter.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CPacketStreamFilter.h b/src/lib/synergy/CPacketStreamFilter.h
index b0a3a408..c578185a 100644
--- a/src/lib/synergy/CPacketStreamFilter.h
+++ b/src/lib/synergy/CPacketStreamFilter.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CPlatformScreen.cpp b/src/lib/synergy/CPlatformScreen.cpp
index d507b32f..15947b25 100644
--- a/src/lib/synergy/CPlatformScreen.cpp
+++ b/src/lib/synergy/CPlatformScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CPlatformScreen.h b/src/lib/synergy/CPlatformScreen.h
index e6402998..45d8dd43 100644
--- a/src/lib/synergy/CPlatformScreen.h
+++ b/src/lib/synergy/CPlatformScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CProtocolUtil.cpp b/src/lib/synergy/CProtocolUtil.cpp
index 517d8082..3445bebc 100644
--- a/src/lib/synergy/CProtocolUtil.cpp
+++ b/src/lib/synergy/CProtocolUtil.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CProtocolUtil.h b/src/lib/synergy/CProtocolUtil.h
index 085e7147..2ddc8e97 100644
--- a/src/lib/synergy/CProtocolUtil.h
+++ b/src/lib/synergy/CProtocolUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CScreen.cpp b/src/lib/synergy/CScreen.cpp
index 9996148e..07206301 100644
--- a/src/lib/synergy/CScreen.cpp
+++ b/src/lib/synergy/CScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CScreen.h b/src/lib/synergy/CScreen.h
index dc7defcf..6c54704c 100644
--- a/src/lib/synergy/CScreen.h
+++ b/src/lib/synergy/CScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CServerApp.cpp b/src/lib/synergy/CServerApp.cpp
index 26871952..d4b3568d 100644
--- a/src/lib/synergy/CServerApp.cpp
+++ b/src/lib/synergy/CServerApp.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CServerApp.h b/src/lib/synergy/CServerApp.h
index ab432cef..571c2471 100644
--- a/src/lib/synergy/CServerApp.h
+++ b/src/lib/synergy/CServerApp.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CServerTaskBarReceiver.cpp b/src/lib/synergy/CServerTaskBarReceiver.cpp
index ca19af73..ddf68219 100644
--- a/src/lib/synergy/CServerTaskBarReceiver.cpp
+++ b/src/lib/synergy/CServerTaskBarReceiver.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CServerTaskBarReceiver.h b/src/lib/synergy/CServerTaskBarReceiver.h
index 9bfb5cc7..6a1b1dc8 100644
--- a/src/lib/synergy/CServerTaskBarReceiver.h
+++ b/src/lib/synergy/CServerTaskBarReceiver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/CVncClient.cpp b/src/lib/synergy/CVncClient.cpp
index 02ef939c..8ffa1c1f 100644
--- a/src/lib/synergy/CVncClient.cpp
+++ b/src/lib/synergy/CVncClient.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/CVncClient.h b/src/lib/synergy/CVncClient.h
index da9c607e..b2bdfbd7 100644
--- a/src/lib/synergy/CVncClient.h
+++ b/src/lib/synergy/CVncClient.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/ClipboardTypes.h b/src/lib/synergy/ClipboardTypes.h
index 43ecf408..a61b46c4 100644
--- a/src/lib/synergy/ClipboardTypes.h
+++ b/src/lib/synergy/ClipboardTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/GameDeviceTypes.h b/src/lib/synergy/GameDeviceTypes.h
index c8bd3f13..8f6208a2 100644
--- a/src/lib/synergy/GameDeviceTypes.h
+++ b/src/lib/synergy/GameDeviceTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/Global.h b/src/lib/synergy/Global.h
index 6da57d61..288f247d 100644
--- a/src/lib/synergy/Global.h
+++ b/src/lib/synergy/Global.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IApp.h b/src/lib/synergy/IApp.h
index 747a6f61..88c0d96e 100644
--- a/src/lib/synergy/IApp.h
+++ b/src/lib/synergy/IApp.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/lib/synergy/IAppUtil.h b/src/lib/synergy/IAppUtil.h
index ec9c0046..1533e4a5 100644
--- a/src/lib/synergy/IAppUtil.h
+++ b/src/lib/synergy/IAppUtil.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IClient.h b/src/lib/synergy/IClient.h
index eddfdc1f..c49f4275 100644
--- a/src/lib/synergy/IClient.h
+++ b/src/lib/synergy/IClient.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IClipboard.cpp b/src/lib/synergy/IClipboard.cpp
index d130ad07..97612bd8 100644
--- a/src/lib/synergy/IClipboard.cpp
+++ b/src/lib/synergy/IClipboard.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IClipboard.h b/src/lib/synergy/IClipboard.h
index 037962db..96f87612 100644
--- a/src/lib/synergy/IClipboard.h
+++ b/src/lib/synergy/IClipboard.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IKeyState.cpp b/src/lib/synergy/IKeyState.cpp
index 3d9efac9..1cfde581 100644
--- a/src/lib/synergy/IKeyState.cpp
+++ b/src/lib/synergy/IKeyState.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IKeyState.h b/src/lib/synergy/IKeyState.h
index 2966da84..904edbe8 100644
--- a/src/lib/synergy/IKeyState.h
+++ b/src/lib/synergy/IKeyState.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/INode.h b/src/lib/synergy/INode.h
index 50a1fd66..2ab170ef 100644
--- a/src/lib/synergy/INode.h
+++ b/src/lib/synergy/INode.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IPlatformScreen.h b/src/lib/synergy/IPlatformScreen.h
index 2287177a..55421126 100644
--- a/src/lib/synergy/IPlatformScreen.h
+++ b/src/lib/synergy/IPlatformScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IPrimaryScreen.cpp b/src/lib/synergy/IPrimaryScreen.cpp
index 92e7a9c3..70c16cb3 100644
--- a/src/lib/synergy/IPrimaryScreen.cpp
+++ b/src/lib/synergy/IPrimaryScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IPrimaryScreen.h b/src/lib/synergy/IPrimaryScreen.h
index a746d02b..5f85edab 100644
--- a/src/lib/synergy/IPrimaryScreen.h
+++ b/src/lib/synergy/IPrimaryScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IScreen.cpp b/src/lib/synergy/IScreen.cpp
index 83b6328f..7f7f1217 100644
--- a/src/lib/synergy/IScreen.cpp
+++ b/src/lib/synergy/IScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2004 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2004 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IScreen.h b/src/lib/synergy/IScreen.h
index b6f5e107..b6a76288 100644
--- a/src/lib/synergy/IScreen.h
+++ b/src/lib/synergy/IScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/IScreenSaver.h b/src/lib/synergy/IScreenSaver.h
index 460518c3..53716fda 100644
--- a/src/lib/synergy/IScreenSaver.h
+++ b/src/lib/synergy/IScreenSaver.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/ISecondaryScreen.cpp b/src/lib/synergy/ISecondaryScreen.cpp
index d2dc6539..91079af7 100644
--- a/src/lib/synergy/ISecondaryScreen.cpp
+++ b/src/lib/synergy/ISecondaryScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/ISecondaryScreen.h b/src/lib/synergy/ISecondaryScreen.h
index 2f624ba6..6473daab 100644
--- a/src/lib/synergy/ISecondaryScreen.h
+++ b/src/lib/synergy/ISecondaryScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2003 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2003 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/KeyTypes.cpp b/src/lib/synergy/KeyTypes.cpp
index a51e6ffb..6c65e0ce 100644
--- a/src/lib/synergy/KeyTypes.cpp
+++ b/src/lib/synergy/KeyTypes.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/KeyTypes.h b/src/lib/synergy/KeyTypes.h
index 116d326b..ac5b1abd 100644
--- a/src/lib/synergy/KeyTypes.h
+++ b/src/lib/synergy/KeyTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/MouseTypes.h b/src/lib/synergy/MouseTypes.h
index b72c7056..b62fee67 100644
--- a/src/lib/synergy/MouseTypes.h
+++ b/src/lib/synergy/MouseTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/OptionTypes.h b/src/lib/synergy/OptionTypes.h
index 6515d2f5..0a05edfd 100644
--- a/src/lib/synergy/OptionTypes.h
+++ b/src/lib/synergy/OptionTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/ProtocolTypes.cpp b/src/lib/synergy/ProtocolTypes.cpp
index 7c50038b..ebcf48cc 100644
--- a/src/lib/synergy/ProtocolTypes.cpp
+++ b/src/lib/synergy/ProtocolTypes.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/ProtocolTypes.h b/src/lib/synergy/ProtocolTypes.h
index 028729d4..fca16a5e 100644
--- a/src/lib/synergy/ProtocolTypes.h
+++ b/src/lib/synergy/ProtocolTypes.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/XScreen.cpp b/src/lib/synergy/XScreen.cpp
index bc1a4bd1..3d71eb86 100644
--- a/src/lib/synergy/XScreen.cpp
+++ b/src/lib/synergy/XScreen.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/XScreen.h b/src/lib/synergy/XScreen.h
index 00fc12b0..dadbb941 100644
--- a/src/lib/synergy/XScreen.h
+++ b/src/lib/synergy/XScreen.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/XSynergy.cpp b/src/lib/synergy/XSynergy.cpp
index e3191c2e..e42cd43d 100644
--- a/src/lib/synergy/XSynergy.cpp
+++ b/src/lib/synergy/XSynergy.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/lib/synergy/XSynergy.h b/src/lib/synergy/XSynergy.h
index 59b63964..ca763475 100644
--- a/src/lib/synergy/XSynergy.h
+++ b/src/lib/synergy/XSynergy.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2002 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2002 Chris Schoeneman
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/micro/CMakeLists.txt b/src/micro/CMakeLists.txt
index 4380cbbe..281e1504 100644
--- a/src/micro/CMakeLists.txt
+++ b/src/micro/CMakeLists.txt
@@ -1,4 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Bolton Software Ltd.
 # Copyright (C) 2012 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
diff --git a/src/micro/uSynergy.h b/src/micro/uSynergy.h
index e3be71f8..18a17162 100644
--- a/src/micro/uSynergy.h
+++ b/src/micro/uSynergy.h
@@ -2,6 +2,7 @@
 uSynergy client -- Interface for the embedded Synergy client library
   version 1.0.0, July 7th, 2012
 
+Copyright (C) 2012 Bolton Software Ltd.
 Copyright (c) 2012 Alex Evans
 
 This software is provided 'as-is', without any express or implied
diff --git a/src/plugin/CMakeLists.txt b/src/plugin/CMakeLists.txt
index 194031b8..ecd584a2 100644
--- a/src/plugin/CMakeLists.txt
+++ b/src/plugin/CMakeLists.txt
@@ -1,4 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Bolton Software Ltd.
 # Copyright (C) 2012 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
diff --git a/src/plugin/winmmjoy/CMakeLists.txt b/src/plugin/winmmjoy/CMakeLists.txt
index 30d0c576..9ab71e69 100644
--- a/src/plugin/winmmjoy/CMakeLists.txt
+++ b/src/plugin/winmmjoy/CMakeLists.txt
@@ -1,4 +1,5 @@
 # synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Bolton Software Ltd.
 # Copyright (C) 2012 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
diff --git a/src/plugin/winmmjoy/winmmjoy.cpp b/src/plugin/winmmjoy/winmmjoy.cpp
index a945e34e..a1de587a 100644
--- a/src/plugin/winmmjoy/winmmjoy.cpp
+++ b/src/plugin/winmmjoy/winmmjoy.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/plugin/winmmjoy/winmmjoy.h b/src/plugin/winmmjoy/winmmjoy.h
index fe9d8c79..3bbbda51 100644
--- a/src/plugin/winmmjoy/winmmjoy.h
+++ b/src/plugin/winmmjoy/winmmjoy.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index b0725df8..7d9b878c 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2011 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/test/guitests/src/VersionCheckerTests.cpp b/src/test/guitests/src/VersionCheckerTests.cpp
index 2cd7659e..d01fbeec 100644
--- a/src/test/guitests/src/VersionCheckerTests.cpp
+++ b/src/test/guitests/src/VersionCheckerTests.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/test/guitests/src/VersionCheckerTests.h b/src/test/guitests/src/VersionCheckerTests.h
index 865469a9..79cb78e4 100644
--- a/src/test/guitests/src/VersionCheckerTests.h
+++ b/src/test/guitests/src/VersionCheckerTests.h
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/test/guitests/src/main.cpp b/src/test/guitests/src/main.cpp
index aec3b538..c466529f 100644
--- a/src/test/guitests/src/main.cpp
+++ b/src/test/guitests/src/main.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/test/integtests/CIpcTests.cpp b/src/test/integtests/CIpcTests.cpp
index 56817a58..904a4017 100644
--- a/src/test/integtests/CIpcTests.cpp
+++ b/src/test/integtests/CIpcTests.cpp
@@ -1,5 +1,6 @@
 /*
  * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2012 Bolton Software Ltd.
  * Copyright (C) 2012 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index fd3b490c..672a294e 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/Main.cpp b/src/test/integtests/Main.cpp
index f1f6ebac..d76bb30b 100644
--- a/src/test/integtests/Main.cpp
+++ b/src/test/integtests/Main.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/CMSWindowsClipboardTests.cpp b/src/test/integtests/platform/CMSWindowsClipboardTests.cpp
index e3779666..8b1a2697 100644
--- a/src/test/integtests/platform/CMSWindowsClipboardTests.cpp
+++ b/src/test/integtests/platform/CMSWindowsClipboardTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/CMSWindowsKeyStateTests.cpp b/src/test/integtests/platform/CMSWindowsKeyStateTests.cpp
index a7bfb467..445099ea 100644
--- a/src/test/integtests/platform/CMSWindowsKeyStateTests.cpp
+++ b/src/test/integtests/platform/CMSWindowsKeyStateTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/COSXClipboardTests.cpp b/src/test/integtests/platform/COSXClipboardTests.cpp
index f9e6a19a..107e7926 100644
--- a/src/test/integtests/platform/COSXClipboardTests.cpp
+++ b/src/test/integtests/platform/COSXClipboardTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/COSXKeyStateTests.cpp b/src/test/integtests/platform/COSXKeyStateTests.cpp
index 0786067b..f20e8344 100644
--- a/src/test/integtests/platform/COSXKeyStateTests.cpp
+++ b/src/test/integtests/platform/COSXKeyStateTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/CXWindowsClipboardTests.cpp b/src/test/integtests/platform/CXWindowsClipboardTests.cpp
index 3565f938..47b5d875 100644
--- a/src/test/integtests/platform/CXWindowsClipboardTests.cpp
+++ b/src/test/integtests/platform/CXWindowsClipboardTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/CXWindowsKeyStateTests.cpp b/src/test/integtests/platform/CXWindowsKeyStateTests.cpp
index ea665889..780862c5 100644
--- a/src/test/integtests/platform/CXWindowsKeyStateTests.cpp
+++ b/src/test/integtests/platform/CXWindowsKeyStateTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/CXWindowsScreenSaverTests.cpp b/src/test/integtests/platform/CXWindowsScreenSaverTests.cpp
index f896840c..c7a2bca5 100644
--- a/src/test/integtests/platform/CXWindowsScreenSaverTests.cpp
+++ b/src/test/integtests/platform/CXWindowsScreenSaverTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/integtests/platform/CXWindowsScreenTests.cpp b/src/test/integtests/platform/CXWindowsScreenTests.cpp
index ea36d620..9e5835e2 100644
--- a/src/test/integtests/platform/CXWindowsScreenTests.cpp
+++ b/src/test/integtests/platform/CXWindowsScreenTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
index f319f4ba..540e9400 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/Main.cpp b/src/test/unittests/Main.cpp
index f1932827..58533e4b 100644
--- a/src/test/unittests/Main.cpp
+++ b/src/test/unittests/Main.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/client/CMockClient.h b/src/test/unittests/client/CMockClient.h
index abc37c08..0311a1e4 100644
--- a/src/test/unittests/client/CMockClient.h
+++ b/src/test/unittests/client/CMockClient.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/client/CServerProxyTests.cpp b/src/test/unittests/client/CServerProxyTests.cpp
index 38858d73..b37cc0a1 100644
--- a/src/test/unittests/client/CServerProxyTests.cpp
+++ b/src/test/unittests/client/CServerProxyTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/io/CMockStream.h b/src/test/unittests/io/CMockStream.h
index 2e69a639..9acca308 100644
--- a/src/test/unittests/io/CMockStream.h
+++ b/src/test/unittests/io/CMockStream.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/synergy/CClipboardTests.cpp b/src/test/unittests/synergy/CClipboardTests.cpp
index cf14e382..7379f562 100644
--- a/src/test/unittests/synergy/CClipboardTests.cpp
+++ b/src/test/unittests/synergy/CClipboardTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/synergy/CKeyStateTests.cpp b/src/test/unittests/synergy/CKeyStateTests.cpp
index 51e1caf5..1edd508e 100644
--- a/src/test/unittests/synergy/CKeyStateTests.cpp
+++ b/src/test/unittests/synergy/CKeyStateTests.cpp
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/synergy/CKeyStateTests.h b/src/test/unittests/synergy/CKeyStateTests.h
index fea2f6f8..a4f9016f 100644
--- a/src/test/unittests/synergy/CKeyStateTests.h
+++ b/src/test/unittests/synergy/CKeyStateTests.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/synergy/CMockEventQueue.h b/src/test/unittests/synergy/CMockEventQueue.h
index 9ea396b9..67a985ee 100644
--- a/src/test/unittests/synergy/CMockEventQueue.h
+++ b/src/test/unittests/synergy/CMockEventQueue.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  * 
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/src/test/unittests/synergy/CMockKeyMap.h b/src/test/unittests/synergy/CMockKeyMap.h
index 2fbf88d7..ce7a0a38 100644
--- a/src/test/unittests/synergy/CMockKeyMap.h
+++ b/src/test/unittests/synergy/CMockKeyMap.h
@@ -1,6 +1,7 @@
 /*
  * synergy -- mouse and keyboard sharing utility
- * Copyright (C) 2011 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+ * Copyright (C) 2012 Bolton Software Ltd.
+ * Copyright (C) 2011 Nick Bolton
  *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/tools/build/__init__.py b/tools/build/__init__.py
index f272ddb0..690cbcf1 100644
--- a/tools/build/__init__.py
+++ b/tools/build/__init__.py
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/tools/build/ftputil.py b/tools/build/ftputil.py
index 31daf68b..c0bf0d15 100644
--- a/tools/build/ftputil.py
+++ b/tools/build/ftputil.py
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2010 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2010 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
diff --git a/tools/build/generators.py b/tools/build/generators.py
index 1d326071..0c16cd4d 100644
--- a/tools/build/generators.py
+++ b/tools/build/generators.py
@@ -1,3 +1,19 @@
+# synergy -- mouse and keyboard sharing utility
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
+# 
+# This package is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# found in the file COPYING that should have accompanied this file.
+# 
+# This package 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/>.
+
 class Generator(object):
 	def __init__(self, cmakeName, buildDir='build', sourceDir='..', binDir='bin'):
 		self.cmakeName = cmakeName
diff --git a/tools/build/toolchain.py b/tools/build/toolchain.py
index 96c8c070..9cbd32d2 100644
--- a/tools/build/toolchain.py
+++ b/tools/build/toolchain.py
@@ -1,5 +1,6 @@
 # synergy -- mouse and keyboard sharing utility
-# Copyright (C) 2009 Chris Schoeneman, Nick Bolton, Sorin Sbarnea
+# Copyright (C) 2012 Bolton Software Ltd.
+# Copyright (C) 2009 Nick Bolton
 # 
 # This package is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License