diff --git a/src/java/org/apache/commons/csv/CSVParser.java b/src/java/org/apache/commons/csv/CSVParser.java
index afbc9f62..44b5d447 100644
--- a/src/java/org/apache/commons/csv/CSVParser.java
+++ b/src/java/org/apache/commons/csv/CSVParser.java
@@ -1,13 +1,19 @@
 /*
- * The copyright to the computer program(s) herein is the property of
- * Netcetera AG, Switzerland. The program(s) may be used and/or copied
- * only with the written permission of Netcetera AG or in accordance
- * with the terms and conditions stipulated in the agreement/contract
- * under which the program(s) have been supplied.
- *
- * @(#) $Id: CSVParser.java,v 1.10 2004/09/30 13:37:10 hagger Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package ch.netcetera.wake.core.format.csv;
+package org.apache.commons.csv;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -760,4 +766,4 @@ public class CSVParser {
   private boolean isEndOfFile(int c) {
     return c == ExtendedBufferedReader.END_OF_STREAM;
   }
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/commons/csv/CSVPrinter.java b/src/java/org/apache/commons/csv/CSVPrinter.java
index 085bfc1b..dca54956 100644
--- a/src/java/org/apache/commons/csv/CSVPrinter.java
+++ b/src/java/org/apache/commons/csv/CSVPrinter.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (C) 2002-2004 by Netcetera AG.
- * All rights reserved.
- *
- * The copyright to the computer program(s) herein is the property of
- * Netcetera AG, Switzerland.  The program(s) may be used and/or copied
- * only with the written permission of Netcetera AG or in accordance
- * with the terms and conditions stipulated in the agreement/contract
- * under which the program(s) have been supplied.
- *
- * @(#) $Id: CSVPrinter.java,v 1.4 2004/08/10 12:35:27 rgrunder Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
-package ch.netcetera.wake.core.format.csv;
+package org.apache.commons.csv;
 
 import java.io.OutputStream;
 import java.io.PrintWriter;
diff --git a/src/java/org/apache/commons/csv/ExtendedBufferedReader.java b/src/java/org/apache/commons/csv/ExtendedBufferedReader.java
index a8eb543a..73c5333e 100644
--- a/src/java/org/apache/commons/csv/ExtendedBufferedReader.java
+++ b/src/java/org/apache/commons/csv/ExtendedBufferedReader.java
@@ -1,18 +1,19 @@
 /*
-* playground
-*
-* Copyright (C) 2004 by Netcetera AG.
-* All rights reserved.
-*
-* The copyright to the computer program(s) herein is the property of
-* Netcetera AG, Switzerland. The program(s) may be used and/or copied
-* only with the written permission of Netcetera AG or in accordance
-* with the terms and conditions stipulated in the agreement/contract
-* under which the program(s) have been supplied.
-*
-* @(#) $Id: ExtendedBufferedReader.java,v 1.3 2004/09/30 13:37:10 hagger Exp $
-*/
-package ch.netcetera.wake.core.format.csv;
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.csv;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/test/org/apache/commons/csv/CSVParserTest.java b/src/test/org/apache/commons/csv/CSVParserTest.java
index 7fe6ea68..164992ac 100644
--- a/src/test/org/apache/commons/csv/CSVParserTest.java
+++ b/src/test/org/apache/commons/csv/CSVParserTest.java
@@ -1,13 +1,19 @@
 /*
-* The copyright to the computer program(s) herein is the property of
-* Netcetera AG, Switzerland. The program(s) may be used and/or copied
-* only with the written permission of Netcetera AG or in accordance
-* with the terms and conditions stipulated in the agreement/contract
-* under which the program(s) have been supplied.
-*
-* @(#) $Id: CSVParserTest.java,v 1.5 2004/05/18 09:41:26 uhardegg Exp $
-*/
-package ch.netcetera.wake.core.format.csv;
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.csv;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/test/org/apache/commons/csv/CSVPrinterTest.java b/src/test/org/apache/commons/csv/CSVPrinterTest.java
index 5a48f29b..bd2843f5 100644
--- a/src/test/org/apache/commons/csv/CSVPrinterTest.java
+++ b/src/test/org/apache/commons/csv/CSVPrinterTest.java
@@ -1,13 +1,19 @@
 /*
-* The copyright to the computer program(s) herein is the property of
-* Netcetera AG, Switzerland. The program(s) may be used and/or copied
-* only with the written permission of Netcetera AG or in accordance
-* with the terms and conditions stipulated in the agreement/contract
-* under which the program(s) have been supplied.
-*
-* @(#) $Id: CSVPrinterTest.java,v 1.1 2004/08/10 12:38:45 rgrunder Exp $
-*/
-package ch.netcetera.wake.core.format.csv;
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.csv;
 
 import java.io.StringWriter;
 import junit.framework.Test;
diff --git a/src/test/org/apache/commons/csv/ExtendedBufferedReaderTest.java b/src/test/org/apache/commons/csv/ExtendedBufferedReaderTest.java
index ddb5d3ff..26e718fa 100644
--- a/src/test/org/apache/commons/csv/ExtendedBufferedReaderTest.java
+++ b/src/test/org/apache/commons/csv/ExtendedBufferedReaderTest.java
@@ -1,16 +1,19 @@
 /*
- * Copyright (C) 2004 by Netcetera AG.
- * All rights reserved.
- *
- * The copyright to the computer program(s) herein is the property of
- * Netcetera AG, Switzerland. The program(s) may be used and/or copied
- * only with the written permission of Netcetera AG or in accordance
- * with the terms and conditions stipulated in the agreement/contract
- * under which the program(s) have been supplied.
- *
- * @(#) $Id: ExtendedBufferedReaderTest.java,v 1.2 2004/10/20 11:14:11 rgrunder Exp $
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-package ch.netcetera.wake.core.format.csv;
+package org.apache.commons.csv;
 
 import java.io.StringReader;
 import java.util.Arrays;