diff --git a/SConstruct b/SConstruct
index d883715..8057cc8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1,8 +1,9 @@
 # -*- Mode: python -*-
 # SCons build specification
 # see http://www.scons.org if you do not have this tool
-
-# Copyright (C) 2005 OGG, LCC. All rights reserved.
+#
+# Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+#
 #  This software is provided AS-IS with no warranty, either express or
 #  implied.
 #
diff --git a/src/auth.c b/src/auth.c
index 190319d..a271433 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -1,7 +1,7 @@
 /* auth.c
-** libstrophe XMPP client library -- auth functions and handlers
+** strophe XMPP client library -- auth functions and handlers
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.
diff --git a/src/common.h b/src/common.h
index f47ff38..5236ffc 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,7 +1,7 @@
 /* common.h
-** libstrophe XMPP client library -- internal common structures
+** strophe XMPP client library -- internal common structures
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express or
 **  implied.
diff --git a/src/conn.c b/src/conn.c
index 9faa4bb..4823b57 100644
--- a/src/conn.c
+++ b/src/conn.c
@@ -1,7 +1,7 @@
 /* conn.c
-** libstrophe XMPP client library -- connection object functions
+** strophe XMPP client library -- connection object functions
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/ctx.c b/src/ctx.c
index 2c2bb65..f080ca5 100644
--- a/src/ctx.c
+++ b/src/ctx.c
@@ -1,7 +1,7 @@
 /* ctx.c
-** libstrophe XMPP client library -- run-time context implementation
+** strophe XMPP client library -- run-time context implementation
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express 
 **  or implied.
diff --git a/src/event.c b/src/event.c
index 0d6d756..37a5f55 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,7 @@
 /* event.c
-** libstrophe XMPP client library -- event loop and management
+** strophe XMPP client library -- event loop and management
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/handler.c b/src/handler.c
index 3663097..6fde3bc 100644
--- a/src/handler.c
+++ b/src/handler.c
@@ -1,7 +1,7 @@
 /* handler.c
-** libstrophe XMPP client library -- event handler management
+** strophe XMPP client library -- event handler management
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/hash.c b/src/hash.c
index 4dee5b8..58269e7 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,7 +1,7 @@
 /* hash.c
-** libstrophe XMPP client library -- hash table implementation
+** strophe XMPP client library -- hash table implementation
 ** 
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/hash.h b/src/hash.h
index 9a6c43e..28db0a3 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,7 +1,7 @@
 /* hash.h
-** libstrophe XMPP client library -- hash table interface
+** strophe XMPP client library -- hash table interface
 ** 
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/jid.c b/src/jid.c
index a2afd07..8f6b437 100644
--- a/src/jid.c
+++ b/src/jid.c
@@ -1,7 +1,7 @@
 /* jid.c
-** libstrophe XMPP client library -- helper functions for parsing JIDs
+** strophe XMPP client library -- helper functions for parsing JIDs
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/oocontext.cpp b/src/oocontext.cpp
index a82104c..bc5a8c0 100644
--- a/src/oocontext.cpp
+++ b/src/oocontext.cpp
@@ -1,3 +1,17 @@
+/* oocontext.cpp
+** strophe XMPP client library -- C++ context implementation
+** 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
+*/
+
 #include <stdlib.h>
 
 #include "strophe.h"
diff --git a/src/oostanza.cpp b/src/oostanza.cpp
index a4cf963..ce4b49e 100644
--- a/src/oostanza.cpp
+++ b/src/oostanza.cpp
@@ -1,3 +1,17 @@
+/* oostanza.cpp
+** strophe XMPP client library -- C++ context implementation
+** 
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
+*/
+
 #include "strophe.h"
 #include "strophepp.h"
 
diff --git a/src/ostypes.h b/src/ostypes.h
index b96c514..8191592 100644
--- a/src/ostypes.h
+++ b/src/ostypes.h
@@ -1,7 +1,8 @@
 /* ostypes.h
-** libstrophe XMPP client library -- type definitions for platforms without stdint.h
+** strophe XMPP client library -- type definitions for platforms 
+**     without stdint.h
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/parser.c b/src/parser.c
index 7fce8d9..d42cdfb 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1,7 +1,7 @@
 /* parser.c
-** libstrophe XMPP client library -- xml parser handlers and utility functions
+** strophe XMPP client library -- xml parser handlers and utility functions
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/sasl.c b/src/sasl.c
index 71a73d7..8b9e270 100644
--- a/src/sasl.c
+++ b/src/sasl.c
@@ -1,7 +1,7 @@
 /* sasl.c
-** libstrophe XMPP client library -- SASL authentication helpers
+** strophe XMPP client library -- SASL authentication helpers
 ** 
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/sasl.h b/src/sasl.h
index d99194d..8fa9442 100644
--- a/src/sasl.h
+++ b/src/sasl.h
@@ -1,7 +1,7 @@
 /* sasl.h
-** libstrophe XMPP client library -- SASL authentication helpers
+** strophe XMPP client library -- SASL authentication helpers
 ** 
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/sock.c b/src/sock.c
index 2c33fbe..7044f3d 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -1,7 +1,7 @@
 /* sock.c
-** libstrophe XMPP client library -- socket abstraction implementation
+** strophe XMPP client library -- socket abstraction implementation
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
@@ -993,4 +993,4 @@ int sock_srv_lookup(const char *service, const char *proto, const char *domain,
     }
 
     return 1;
-}
\ No newline at end of file
+}
diff --git a/src/sock.h b/src/sock.h
index ebd9dfb..3405194 100644
--- a/src/sock.h
+++ b/src/sock.h
@@ -1,7 +1,7 @@
 /* sock.h
-** libstrophe XMPP client library -- socket abstraction header
+** strophe XMPP client library -- socket abstraction header
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/stanza.c b/src/stanza.c
index b6c46c8..4745c61 100644
--- a/src/stanza.c
+++ b/src/stanza.c
@@ -1,7 +1,7 @@
 /* stanza.c
-** libstrophe XMPP client library -- XMPP stanza object and utilities
+** strophe XMPP client library -- XMPP stanza object and utilities
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/thread.c b/src/thread.c
index 5accf2d..8ee4eaf 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -1,7 +1,7 @@
 /* thread.c
-** libstrophe XMPP client library -- thread abstraction
+** strophe XMPP client library -- thread abstraction
 **
-** Copyright (C) 2005 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/thread.h b/src/thread.h
index 4a5a81b..ce39685 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -1,7 +1,7 @@
 /* thread.h
-** XMPP client library -- thread abstraction header
+** strophe XMPP client library -- thread abstraction header
 **
-** Copyright (C) 2005 OGG, LLC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/tls.h b/src/tls.h
index ca8eb8e..0afbfbc 100644
--- a/src/tls.h
+++ b/src/tls.h
@@ -1,7 +1,7 @@
 /* tls.h
-** libstrophe XMPP client library -- TLS abstraction header
+** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/tls_dummy.c b/src/tls_dummy.c
index 8298920..5ee8087 100644
--- a/src/tls_dummy.c
+++ b/src/tls_dummy.c
@@ -1,7 +1,7 @@
-/* tls.c
-** libstrophe XMPP client library -- TLS abstraction dummy impl.
+/* tls_dummy.c
+** strophe XMPP client library -- TLS abstraction dummy impl.
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/tls_gnutls.c b/src/tls_gnutls.c
index 3e8ffd7..8e4ec78 100644
--- a/src/tls_gnutls.c
+++ b/src/tls_gnutls.c
@@ -1,7 +1,7 @@
 /* tls.c
-** libstrophe XMPP client library -- TLS abstraction header
+** strophe XMPP client library -- TLS abstraction header
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/tls_openssl.c b/src/tls_openssl.c
index ad7ec5a..6864020 100644
--- a/src/tls_openssl.c
+++ b/src/tls_openssl.c
@@ -1,7 +1,7 @@
-/* tls.c
-** libstrophe XMPP client library -- TLS abstraction openssl impl.
+/* tls_openssl.c
+** strophe XMPP client library -- TLS abstraction openssl impl.
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/tls_schannel.c b/src/tls_schannel.c
index aa0053a..20c1db1 100644
--- a/src/tls_schannel.c
+++ b/src/tls_schannel.c
@@ -1,7 +1,7 @@
-/* tls.c
-** libstrophe XMPP client library -- TLS abstraction schannel impl.
+/* tls_schannel.c
+** strophe XMPP client library -- TLS abstraction schannel impl.
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/util.c b/src/util.c
index 660f0c8..469e0e8 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,7 +1,7 @@
 /* util.c
-** libstrophe XMPP client library -- various utility functions
+** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/src/util.h b/src/util.h
index dacd06d..fe78883 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,7 +1,7 @@
 /* util.h
-** libstrophe XMPP client library -- various utility functions
+** strophe XMPP client library -- various utility functions
 **
-** Copyright (C) 2005 OGG, LCC. All rights reserved.
+** Copyright (C) 2005-2008 OGG, LLC. All rights reserved.
 **
 **  This software is provided AS-IS with no warranty, either express
 **  or implied.
diff --git a/strophe.h b/strophe.h
index bc8d947..8559e61 100644
--- a/strophe.h
+++ b/strophe.h
@@ -2,7 +2,14 @@
 ** strophe XMPP client library C API
 **
 ** Copyright (C) 2005-2008 OGG, LLC.
-** Please see LICENSE.txt for details.
+**
+**  This software is provided AS-IS with no warranty, either express or
+**  implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
 */
 
 #ifndef __LIBSTROPHE_STROPHE_H__
diff --git a/strophepp.h b/strophepp.h
index c6af0c8..eaf8993 100644
--- a/strophepp.h
+++ b/strophepp.h
@@ -2,7 +2,14 @@
 ** strophe XMPP client library C++ API
 **
 ** Copyright (C) 2005-2008 OGG, LLC.
-** Please see LICENSE.txt for details.
+**
+**  This software is provided AS-IS with no warranty, either express or
+**  implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
 */
 
 #ifndef __LIBSTROPHE_STROPHEPP_H__