diff --git a/LICENSE b/LICENSE
index 1cdfeac..43dc17a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Radsecproxy is distributed under this license:
 
-* Copyright (c) 2006-2010, UNINETT AS
+* Copyright (c) 2007-2010, UNINETT AS
 * Copyright (c) 2010-2012, NORDUnet A/S
 * All rights reserved.
 *
diff --git a/catgconf.c b/catgconf.c
index c2be206..934e2e0 100644
--- a/catgconf.c
+++ b/catgconf.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2008, UNINETT AS
+ * Copyright (c) 2011-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/debug.c b/debug.c
index a9e4b36..68f0f05 100644
--- a/debug.c
+++ b/debug.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/debug.h b/debug.h
index b892b96..12cb109 100644
--- a/debug.h
+++ b/debug.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/dtls.c b/dtls.c
index fdc99ab..6e75c69 100644
--- a/dtls.c
+++ b/dtls.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS */
+ * Copyright (c) 2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/dtls.h b/dtls.h
index 27183db..2b6a336 100644
--- a/dtls.h
+++ b/dtls.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *dtlsinit(uint8_t h);
diff --git a/fticks.c b/fticks.c
index 4d4d2eb..d7a24af 100644
--- a/fticks.c
+++ b/fticks.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include "radsecproxy.h"
diff --git a/fticks.h b/fticks.h
index dfc209f..1378035 100644
--- a/fticks.h
+++ b/fticks.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 int fticks_configure(struct options *options,
diff --git a/fticks_hashmac.c b/fticks_hashmac.c
index c8ad0dc..38fa126 100644
--- a/fticks_hashmac.c
+++ b/fticks_hashmac.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/fticks_hashmac.h b/fticks_hashmac.h
index 9e06956..b6de771 100644
--- a/fticks_hashmac.h
+++ b/fticks_hashmac.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdint.h>
diff --git a/gconfig.c b/gconfig.c
index e58959b..c1add5b 100644
--- a/gconfig.c
+++ b/gconfig.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #include <string.h>
diff --git a/gconfig.h b/gconfig.h
index 2cdda4f..3cb34b3 100644
--- a/gconfig.h
+++ b/gconfig.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #define CONF_STR 1
diff --git a/hash.c b/hash.c
index 51f039f..ab17433 100644
--- a/hash.c
+++ b/hash.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/hash.h b/hash.h
index 3c359e9..d22a88c 100644
--- a/hash.h
+++ b/hash.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #ifndef SYS_SOLARIS9
diff --git a/hostport.c b/hostport.c
index 27b5b9f..678a9c5 100644
--- a/hostport.c
+++ b/hostport.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/hostport.h b/hostport.h
index 21b1979..1bfeee4 100644
--- a/hostport.h
+++ b/hostport.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2009, UNINETT AS
+ * Copyright (c) 2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 struct hostportres {
diff --git a/list.c b/list.c
index 971daaf..0a193ef 100644
--- a/list.c
+++ b/list.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #include <stdlib.h>
diff --git a/list.h b/list.h
index cf63dce..d9c5199 100644
--- a/list.h
+++ b/list.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007,2009, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/main.c b/main.c
index 9787d1e..c419586 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 int radsecproxy_main(int argc, char **argv);
diff --git a/radmsg.c b/radmsg.c
index 258c9f9..432f88d 100644
--- a/radmsg.c
+++ b/radmsg.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/radmsg.h b/radmsg.h
index cd83609..1bef59b 100644
--- a/radmsg.h
+++ b/radmsg.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #define RAD_Access_Request 1
diff --git a/radsecproxy-hash.c b/radsecproxy-hash.c
index c9e2a7f..350594d 100644
--- a/radsecproxy-hash.c
+++ b/radsecproxy-hash.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <stdio.h>
diff --git a/radsecproxy.c b/radsecproxy.c
index d10d7a8..72399a0 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
+/* Copyright (c) 2007-2009, UNINETT AS
  * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
diff --git a/radsecproxy.h b/radsecproxy.h
index 6542e99..e0b2696 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
+/* Copyright (c) 2007-2009, UNINETT AS
  * Copyright (c) 2010-2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
diff --git a/tcp.c b/tcp.c
index f5dc274..3b758a9 100644
--- a/tcp.c
+++ b/tcp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/tcp.h b/tcp.h
index 239e4a0..f2c90dd 100644
--- a/tcp.h
+++ b/tcp.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *tcpinit(uint8_t h);
diff --git a/tls.c b/tls.c
index 599e2a7..ac33bc9 100644
--- a/tls.c
+++ b/tls.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/tls.h b/tls.h
index 464fcae..ba20e25 100644
--- a/tls.h
+++ b/tls.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *tlsinit(uint8_t h);
diff --git a/tlscommon.c b/tlscommon.c
index 109cef0..619808b 100644
--- a/tlscommon.c
+++ b/tlscommon.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2010-2011, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #if defined(RADPROT_TLS) || defined(RADPROT_DTLS)
diff --git a/tlscommon.h b/tlscommon.h
index 9e2ba02..4f6eadc 100644
--- a/tlscommon.h
+++ b/tlscommon.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #include <openssl/ssl.h>
diff --git a/tlv11.c b/tlv11.c
index 8197e90..cb9a3da 100644
--- a/tlv11.c
+++ b/tlv11.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008-2009, UNINETT AS
+ * Copyright (c) 2010, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #ifdef SYS_SOLARIS9
diff --git a/tlv11.h b/tlv11.h
index e5c653e..87909c0 100644
--- a/tlv11.h
+++ b/tlv11.h
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS
+ * Copyright (c) 2010, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 struct tlv {
diff --git a/udp.c b/udp.c
index 352b2f9..efb5f09 100644
--- a/udp.c
+++ b/udp.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS
+ * Copyright (c) 2012, NORDUnet A/S */
 /* See LICENSE for licensing information. */
 
 #include <signal.h>
diff --git a/udp.h b/udp.h
index 7e5f038..134b0e6 100644
--- a/udp.h
+++ b/udp.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2008, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 const struct protodefs *udpinit(uint8_t h);
diff --git a/util.c b/util.c
index 520abad..fbd5f2a 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>
diff --git a/util.h b/util.h
index eb5c27c..474e11e 100644
--- a/util.h
+++ b/util.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2010, UNINETT AS
- * Copyright (c) 2010-2012, NORDUnet A/S */
+/* Copyright (c) 2007-2009, UNINETT AS */
 /* See LICENSE for licensing information. */
 
 #include <sys/socket.h>