diff --git a/libcelt/arch.h b/libcelt/arch.h
index 7eef2080..3d803b0b 100644
--- a/libcelt/arch.h
+++ b/libcelt/arch.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin */
+/* Copyright (c) 2003-2008 Jean-Marc Valin
+   Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file arch.h
    @brief Various architecture definitions for CELT
diff --git a/libcelt/bands.c b/libcelt/bands.c
index 0c1b9f76..a0998eb8 100644
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-   (C) 2008-2009 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2009 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/bands.h b/libcelt/bands.h
index 5927726e..5fb5ee85 100644
--- a/libcelt/bands.h
+++ b/libcelt/bands.h
@@ -1,5 +1,7 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2009 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/celt.c b/libcelt/celt.c
index fded6557..91b20b73 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-   (C) 2008 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/celt.h b/libcelt/celt.h
index 7f70b39b..37aee27d 100644
--- a/libcelt/celt.h
+++ b/libcelt/celt.h
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-   (C) 2008 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /**
   @file celt.h
   @brief Contains all the functions for encoding and decoding audio
diff --git a/libcelt/celt_header.h b/libcelt/celt_header.h
index 0bb5fa50..357a7f07 100644
--- a/libcelt/celt_header.h
+++ b/libcelt/celt_header.h
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/cwrs.c b/libcelt/cwrs.c
index d675d258..57dd9696 100644
--- a/libcelt/cwrs.c
+++ b/libcelt/cwrs.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2007-2009 Timothy B. Terriberry
+   Written by Timothy B. Terriberry and Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/cwrs.h b/libcelt/cwrs.h
index aa6eace2..c6f4f344 100644
--- a/libcelt/cwrs.h
+++ b/libcelt/cwrs.h
@@ -1,4 +1,7 @@
-/* (C) 2007-2008 Timothy Terriberry */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2007-2009 Timothy B. Terriberry
+   Written by Timothy B. Terriberry and Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/dump_modes.c b/libcelt/dump_modes.c
index dd3b1219..8e3b7861 100644
--- a/libcelt/dump_modes.c
+++ b/libcelt/dump_modes.c
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2008 CSIRO
+   Copyright (c) 2008-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/ecintrin.h b/libcelt/ecintrin.h
index 0f64e316..b0bed9f5 100644
--- a/libcelt/ecintrin.h
+++ b/libcelt/ecintrin.h
@@ -1,5 +1,5 @@
-/* (C) 2003-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2003-2008 Timothy B. Terriberry
+   Copyright (c) 2008 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/entcode.c b/libcelt/entcode.c
index ecedadfe..718b8743 100644
--- a/libcelt/entcode.c
+++ b/libcelt/entcode.c
@@ -1,4 +1,4 @@
-/* (C) 2001-2008 Timothy B. Terriberry
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
 */
 /*
    Redistribution and use in source and binary forms, with or without
diff --git a/libcelt/entcode.h b/libcelt/entcode.h
index 7513c356..4369dfe8 100644
--- a/libcelt/entcode.h
+++ b/libcelt/entcode.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/entdec.c b/libcelt/entdec.c
index 722c8518..ebfda563 100644
--- a/libcelt/entdec.c
+++ b/libcelt/entdec.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/entdec.h b/libcelt/entdec.h
index 36d5274a..d006a97c 100644
--- a/libcelt/entdec.h
+++ b/libcelt/entdec.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/entenc.c b/libcelt/entenc.c
index 095170b2..163c39f3 100644
--- a/libcelt/entenc.c
+++ b/libcelt/entenc.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/entenc.h b/libcelt/entenc.h
index 49f27522..73f67e75 100644
--- a/libcelt/entenc.h
+++ b/libcelt/entenc.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/fixed_debug.h b/libcelt/fixed_debug.h
index 0039ab92..9fe6523c 100644
--- a/libcelt/fixed_debug.h
+++ b/libcelt/fixed_debug.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin */
+/* Copyright (C) 2003-2008 Jean-Marc Valin
+   Copyright (C) 2007-2009 Xiph.Org Foundation */
 /**
    @file fixed_debug.h
    @brief Fixed-point operations with debugging
diff --git a/libcelt/fixed_generic.h b/libcelt/fixed_generic.h
index d4e02af5..5e9c94bc 100644
--- a/libcelt/fixed_generic.h
+++ b/libcelt/fixed_generic.h
@@ -1,4 +1,6 @@
-/* Copyright (C) 2003-2008 Jean-Marc Valin, CSIRO */
+/* Copyright (C) 2007-2009 Xiph.Org Foundation
+   Copyright (C) 2003-2008 Jean-Marc Valin
+   Copyright (C) 2007-2008 CSIRO */
 /**
    @file fixed_generic.h
    @brief Generic fixed-point operations
diff --git a/libcelt/header.c b/libcelt/header.c
index dddfdd1a..928811bc 100644
--- a/libcelt/header.c
+++ b/libcelt/header.c
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/kfft_double.h b/libcelt/kfft_double.h
index c3936326..43b38b0b 100644
--- a/libcelt/kfft_double.h
+++ b/libcelt/kfft_double.h
@@ -1,4 +1,4 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2008 Xiph.Org Foundation, CSIRO
 */
 /*
    Redistribution and use in source and binary forms, with or without
diff --git a/libcelt/kfft_single.c b/libcelt/kfft_single.c
index e72c0468..8d4dc283 100644
--- a/libcelt/kfft_single.c
+++ b/libcelt/kfft_single.c
@@ -1,4 +1,4 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2008 Xiph.Org Foundation, CSIRO
 */
 /*
    Redistribution and use in source and binary forms, with or without
diff --git a/libcelt/kfft_single.h b/libcelt/kfft_single.h
index e4f49eaa..5f2d6733 100644
--- a/libcelt/kfft_single.h
+++ b/libcelt/kfft_single.h
@@ -1,4 +1,4 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2008 Xiph.Org Foundation, CSIRO
 */
 /*
    Redistribution and use in source and binary forms, with or without
diff --git a/libcelt/kiss_fft.c b/libcelt/kiss_fft.c
index a065e673..0a64c6c0 100644
--- a/libcelt/kiss_fft.c
+++ b/libcelt/kiss_fft.c
@@ -1,8 +1,8 @@
 /*
 Copyright (c) 2003-2004, Mark Borgerding
-Lots of modifications by JMV
-Copyright (c) 2005-2007, Jean-Marc Valin
-Copyright (c) 2008,      Jean-Marc Valin, CSIRO
+Lots of modifications by Jean-Marc Valin
+Copyright (c) 2005-2007, Xiph.Org Foundation
+Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
 
 All rights reserved.
 
diff --git a/libcelt/kiss_fft.h b/libcelt/kiss_fft.h
index abddd024..1c462069 100644
--- a/libcelt/kiss_fft.h
+++ b/libcelt/kiss_fft.h
@@ -1,8 +1,8 @@
 /*
 Copyright (c) 2003-2004, Mark Borgerding
-Lots of modifications by JMV
-Copyright (c) 2005-2007, Jean-Marc Valin
-Copyright (c) 2008,      Jean-Marc Valin, CSIRO
+Lots of modifications by Jean-Marc Valin
+Copyright (c) 2005-2007, Xiph.Org Foundation
+Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
 
 All rights reserved.
 
diff --git a/libcelt/laplace.c b/libcelt/laplace.c
index 1eda29ca..f09590e3 100644
--- a/libcelt/laplace.c
+++ b/libcelt/laplace.c
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/laplace.h b/libcelt/laplace.h
index 34ae9052..29e22c89 100644
--- a/libcelt/laplace.h
+++ b/libcelt/laplace.h
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/mathops.h b/libcelt/mathops.h
index 25fe18c6..f0576504 100644
--- a/libcelt/mathops.h
+++ b/libcelt/mathops.h
@@ -1,4 +1,7 @@
-/* Copyright (C) 2002-2008 Jean-Marc Valin */
+/* Copyright (c) 2002-2008 Jean-Marc Valin
+   Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file mathops.h
    @brief Various math functions
diff --git a/libcelt/mdct.c b/libcelt/mdct.c
index f08bdef4..a61d01f6 100644
--- a/libcelt/mdct.c
+++ b/libcelt/mdct.c
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/mdct.h b/libcelt/mdct.h
index b3d51ed9..6bb38594 100644
--- a/libcelt/mdct.h
+++ b/libcelt/mdct.h
@@ -1,5 +1,6 @@
-/* (C) 2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2008 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/mfrngcod.h b/libcelt/mfrngcod.h
index fbd2b25d..c4ed4bd4 100644
--- a/libcelt/mfrngcod.h
+++ b/libcelt/mfrngcod.h
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/mfrngdec.c b/libcelt/mfrngdec.c
index 5239f4e4..a7ddbf2f 100644
--- a/libcelt/mfrngdec.c
+++ b/libcelt/mfrngdec.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/mfrngenc.c b/libcelt/mfrngenc.c
index d1f3c31f..b1d8e364 100644
--- a/libcelt/mfrngenc.c
+++ b/libcelt/mfrngenc.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/modes.c b/libcelt/modes.c
index 9729a4fa..af0d6cac 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -1,5 +1,7 @@
-/* (C) 2007-2009 Jean-Marc Valin, CSIRO
-   (C) 2008 Gregory Maxwell */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/modes.h b/libcelt/modes.h
index a03c25a6..4e99d693 100644
--- a/libcelt/modes.h
+++ b/libcelt/modes.h
@@ -1,5 +1,7 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008 Gregory Maxwell 
+   Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/pitch.c b/libcelt/pitch.c
index 36e6bfc2..7e06f457 100644
--- a/libcelt/pitch.c
+++ b/libcelt/pitch.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file pitch.c
    @brief Pitch analysis
diff --git a/libcelt/pitch.h b/libcelt/pitch.h
index 6e2e4f8c..8668beeb 100644
--- a/libcelt/pitch.h
+++ b/libcelt/pitch.h
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file pitch.h
    @brief Pitch analysis
diff --git a/libcelt/psy.c b/libcelt/psy.c
index 96867e6a..c4f6979e 100644
--- a/libcelt/psy.c
+++ b/libcelt/psy.c
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/psy.h b/libcelt/psy.h
index bf0a51a7..b9a2e54f 100644
--- a/libcelt/psy.h
+++ b/libcelt/psy.h
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/quant_bands.c b/libcelt/quant_bands.c
index d6226949..74eb1e19 100644
--- a/libcelt/quant_bands.c
+++ b/libcelt/quant_bands.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/quant_bands.h b/libcelt/quant_bands.h
index f0163e9c..28e00003 100644
--- a/libcelt/quant_bands.h
+++ b/libcelt/quant_bands.h
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-  */
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/rangedec.c b/libcelt/rangedec.c
index 901cb79e..a8d322b4 100644
--- a/libcelt/rangedec.c
+++ b/libcelt/rangedec.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/rangeenc.c b/libcelt/rangeenc.c
index 51ef9c00..0ba34974 100644
--- a/libcelt/rangeenc.c
+++ b/libcelt/rangeenc.c
@@ -1,5 +1,5 @@
-/* (C) 2001-2008 Timothy B. Terriberry
-   (C) 2008 Jean-Marc Valin */
+/* Copyright (c) 2001-2008 Timothy B. Terriberry
+   Copyright (c) 2008-2009 Xiph.Org Foundation */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/rate.c b/libcelt/rate.c
index 81145050..6dd4eeb1 100644
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2009 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/rate.h b/libcelt/rate.h
index 2c2e1c76..d78e0d8f 100644
--- a/libcelt/rate.h
+++ b/libcelt/rate.h
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/stack_alloc.h b/libcelt/stack_alloc.h
index f1ae11f9..95f40d41 100644
--- a/libcelt/stack_alloc.h
+++ b/libcelt/stack_alloc.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002 Jean-Marc Valin */
+/* Copyright (C) 2002-2003 Jean-Marc Valin
+   Copyright (C) 2007-2009 Xiph.Org Foundation */
 /**
    @file stack_alloc.h
    @brief Temporary memory allocation on stack
diff --git a/libcelt/testcelt.c b/libcelt/testcelt.c
index bcaf391e..51e13b1e 100644
--- a/libcelt/testcelt.c
+++ b/libcelt/testcelt.c
@@ -1,5 +1,6 @@
-/* (C) 2007 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/vq.c b/libcelt/vq.c
index 429ff4c3..c7ece7da 100644
--- a/libcelt/vq.c
+++ b/libcelt/vq.c
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/libcelt/vq.h b/libcelt/vq.h
index f6099adb..6258297e 100644
--- a/libcelt/vq.h
+++ b/libcelt/vq.h
@@ -1,5 +1,6 @@
-/* (C) 2007-2008 Jean-Marc Valin, CSIRO
-*/
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
 /**
    @file vq.h
    @brief Vector quantisation of the residual
diff --git a/tools/celtclient.c b/tools/celtclient.c
index f55bbfdb..879bcecd 100644
--- a/tools/celtclient.c
+++ b/tools/celtclient.c
@@ -3,6 +3,7 @@
    Copyright (C) 2006 Commonwealth Scientific and Industrial Research
                       Organisation (CSIRO) Australia
    Copyright (C) 2008-2009 Gregory Maxwell
+   Copyright (c) 2007-2009 Xiph.Org Foundation
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
diff --git a/tools/celtdec.c b/tools/celtdec.c
index 11dc361a..0f9847d9 100644
--- a/tools/celtdec.c
+++ b/tools/celtdec.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 2008 Jean-Marc Valin, CSIRO
+/* Copyright (c) 2002-2007 Jean-Marc Valin
+   Copyright (c) 2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
    File: celtdec.c
 
    Redistribution and use in source and binary forms, with or without
diff --git a/tools/celtenc.c b/tools/celtenc.c
index 8a44d790..b8df2e12 100644
--- a/tools/celtenc.c
+++ b/tools/celtenc.c
@@ -1,5 +1,6 @@
-/* Copyright (C) 2002-2008 Jean-Marc Valin 
-   Copyright (C) 2008-2009 Gregory Maxwell
+/* Copyright (c) 2002-2007 Jean-Marc Valin 
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2009 Gregory Maxwell
    File: celtenc.c
 
    Redistribution and use in source and binary forms, with or without