diff --git a/src/main/java/com/typesafe/config/Config.java b/src/main/java/com/typesafe/config/Config.java
index 94abf9d9..909eda73 100644
--- a/src/main/java/com/typesafe/config/Config.java
+++ b/src/main/java/com/typesafe/config/Config.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 import java.util.List;
diff --git a/src/main/java/com/typesafe/config/ConfigException.java b/src/main/java/com/typesafe/config/ConfigException.java
index 894f6bc1..77632311 100644
--- a/src/main/java/com/typesafe/config/ConfigException.java
+++ b/src/main/java/com/typesafe/config/ConfigException.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/ConfigFactory.java b/src/main/java/com/typesafe/config/ConfigFactory.java
index cd82e3fa..d2d802c3 100644
--- a/src/main/java/com/typesafe/config/ConfigFactory.java
+++ b/src/main/java/com/typesafe/config/ConfigFactory.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 import java.io.File;
diff --git a/src/main/java/com/typesafe/config/ConfigIncludeContext.java b/src/main/java/com/typesafe/config/ConfigIncludeContext.java
index a79fa6ed..a7702501 100644
--- a/src/main/java/com/typesafe/config/ConfigIncludeContext.java
+++ b/src/main/java/com/typesafe/config/ConfigIncludeContext.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 
diff --git a/src/main/java/com/typesafe/config/ConfigIncluder.java b/src/main/java/com/typesafe/config/ConfigIncluder.java
index 5f100a52..364b8c5e 100644
--- a/src/main/java/com/typesafe/config/ConfigIncluder.java
+++ b/src/main/java/com/typesafe/config/ConfigIncluder.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/ConfigList.java b/src/main/java/com/typesafe/config/ConfigList.java
index 5efe7014..0688c29a 100644
--- a/src/main/java/com/typesafe/config/ConfigList.java
+++ b/src/main/java/com/typesafe/config/ConfigList.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 import java.util.List;
diff --git a/src/main/java/com/typesafe/config/ConfigMergeable.java b/src/main/java/com/typesafe/config/ConfigMergeable.java
index c1b0b6fc..9c3b30bb 100644
--- a/src/main/java/com/typesafe/config/ConfigMergeable.java
+++ b/src/main/java/com/typesafe/config/ConfigMergeable.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/ConfigObject.java b/src/main/java/com/typesafe/config/ConfigObject.java
index 17633584..bf54116f 100644
--- a/src/main/java/com/typesafe/config/ConfigObject.java
+++ b/src/main/java/com/typesafe/config/ConfigObject.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 import java.util.Map;
diff --git a/src/main/java/com/typesafe/config/ConfigOrigin.java b/src/main/java/com/typesafe/config/ConfigOrigin.java
index 39358880..73240736 100644
--- a/src/main/java/com/typesafe/config/ConfigOrigin.java
+++ b/src/main/java/com/typesafe/config/ConfigOrigin.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/ConfigParseOptions.java b/src/main/java/com/typesafe/config/ConfigParseOptions.java
index 8b26fc45..ac0c8f39 100644
--- a/src/main/java/com/typesafe/config/ConfigParseOptions.java
+++ b/src/main/java/com/typesafe/config/ConfigParseOptions.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 
diff --git a/src/main/java/com/typesafe/config/ConfigParseable.java b/src/main/java/com/typesafe/config/ConfigParseable.java
index 9845d2ac..4c19b545 100644
--- a/src/main/java/com/typesafe/config/ConfigParseable.java
+++ b/src/main/java/com/typesafe/config/ConfigParseable.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 import java.net.URL;
diff --git a/src/main/java/com/typesafe/config/ConfigResolveOptions.java b/src/main/java/com/typesafe/config/ConfigResolveOptions.java
index 91e3320c..6f572a84 100644
--- a/src/main/java/com/typesafe/config/ConfigResolveOptions.java
+++ b/src/main/java/com/typesafe/config/ConfigResolveOptions.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 public final class ConfigResolveOptions {
diff --git a/src/main/java/com/typesafe/config/ConfigRoot.java b/src/main/java/com/typesafe/config/ConfigRoot.java
index 75542806..e86fe931 100644
--- a/src/main/java/com/typesafe/config/ConfigRoot.java
+++ b/src/main/java/com/typesafe/config/ConfigRoot.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/ConfigSyntax.java b/src/main/java/com/typesafe/config/ConfigSyntax.java
index c1c68d07..4f43fe73 100644
--- a/src/main/java/com/typesafe/config/ConfigSyntax.java
+++ b/src/main/java/com/typesafe/config/ConfigSyntax.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 public enum ConfigSyntax {
diff --git a/src/main/java/com/typesafe/config/ConfigValue.java b/src/main/java/com/typesafe/config/ConfigValue.java
index 006b89a9..1bd3fc07 100644
--- a/src/main/java/com/typesafe/config/ConfigValue.java
+++ b/src/main/java/com/typesafe/config/ConfigValue.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/ConfigValueFactory.java b/src/main/java/com/typesafe/config/ConfigValueFactory.java
index 05ffefa1..fd63a6ff 100644
--- a/src/main/java/com/typesafe/config/ConfigValueFactory.java
+++ b/src/main/java/com/typesafe/config/ConfigValueFactory.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 import java.util.Collection;
diff --git a/src/main/java/com/typesafe/config/ConfigValueType.java b/src/main/java/com/typesafe/config/ConfigValueType.java
index 1de79169..0ead8e19 100644
--- a/src/main/java/com/typesafe/config/ConfigValueType.java
+++ b/src/main/java/com/typesafe/config/ConfigValueType.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config;
 
 /**
diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
index 6e4ff47c..8b0f1602 100644
--- a/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
+++ b/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java b/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java
index c4e5c3bf..63cb0d57 100644
--- a/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java
+++ b/src/main/java/com/typesafe/config/impl/AbstractConfigValue.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigMergeable;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigBoolean.java b/src/main/java/com/typesafe/config/impl/ConfigBoolean.java
index 614a12e6..d45dbd13 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigBoolean.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigBoolean.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java b/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
index 3215958d..0a8a7055 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java b/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java
index 5a05403b..c0a15f4d 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigDouble.java b/src/main/java/com/typesafe/config/impl/ConfigDouble.java
index 483cf9cd..33179744 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigDouble.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigDouble.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigImpl.java b/src/main/java/com/typesafe/config/impl/ConfigImpl.java
index 9f45cb37..e9fff371 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigImpl.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigImpl.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.io.File;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigInt.java b/src/main/java/com/typesafe/config/impl/ConfigInt.java
index 192abbde..4ce4a585 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigInt.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigInt.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigLong.java b/src/main/java/com/typesafe/config/impl/ConfigLong.java
index f949f10b..feb3897b 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigLong.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigLong.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigNull.java b/src/main/java/com/typesafe/config/impl/ConfigNull.java
index 84a7a415..ea8976e3 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigNull.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigNull.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigNumber.java b/src/main/java/com/typesafe/config/impl/ConfigNumber.java
index eec0ff50..af45d1d3 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigNumber.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigNumber.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigString.java b/src/main/java/com/typesafe/config/impl/ConfigString.java
index 522d5bf5..e054b6c9 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigString.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigString.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java b/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java
index ae894e03..7f294d66 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigSubstitution.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/typesafe/config/impl/ConfigUtil.java b/src/main/java/com/typesafe/config/impl/ConfigUtil.java
index fff540e1..bfd8f055 100644
--- a/src/main/java/com/typesafe/config/impl/ConfigUtil.java
+++ b/src/main/java/com/typesafe/config/impl/ConfigUtil.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 
diff --git a/src/main/java/com/typesafe/config/impl/DefaultTransformer.java b/src/main/java/com/typesafe/config/impl/DefaultTransformer.java
index 62913a1c..4391814a 100644
--- a/src/main/java/com/typesafe/config/impl/DefaultTransformer.java
+++ b/src/main/java/com/typesafe/config/impl/DefaultTransformer.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigValueType;
diff --git a/src/main/java/com/typesafe/config/impl/FromMapMode.java b/src/main/java/com/typesafe/config/impl/FromMapMode.java
index 0a646b2e..ce6c3e3f 100644
--- a/src/main/java/com/typesafe/config/impl/FromMapMode.java
+++ b/src/main/java/com/typesafe/config/impl/FromMapMode.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 enum FromMapMode {
diff --git a/src/main/java/com/typesafe/config/impl/Parseable.java b/src/main/java/com/typesafe/config/impl/Parseable.java
index f97bb8f5..eef9e75b 100644
--- a/src/main/java/com/typesafe/config/impl/Parseable.java
+++ b/src/main/java/com/typesafe/config/impl/Parseable.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.io.BufferedReader;
diff --git a/src/main/java/com/typesafe/config/impl/Parser.java b/src/main/java/com/typesafe/config/impl/Parser.java
index b0c68b10..d168e8d5 100644
--- a/src/main/java/com/typesafe/config/impl/Parser.java
+++ b/src/main/java/com/typesafe/config/impl/Parser.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.io.StringReader;
diff --git a/src/main/java/com/typesafe/config/impl/Path.java b/src/main/java/com/typesafe/config/impl/Path.java
index cf6d959f..b0434f0f 100644
--- a/src/main/java/com/typesafe/config/impl/Path.java
+++ b/src/main/java/com/typesafe/config/impl/Path.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.Iterator;
diff --git a/src/main/java/com/typesafe/config/impl/PathBuilder.java b/src/main/java/com/typesafe/config/impl/PathBuilder.java
index 3f3643e8..f46e7820 100644
--- a/src/main/java/com/typesafe/config/impl/PathBuilder.java
+++ b/src/main/java/com/typesafe/config/impl/PathBuilder.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.Stack;
diff --git a/src/main/java/com/typesafe/config/impl/PropertiesParser.java b/src/main/java/com/typesafe/config/impl/PropertiesParser.java
index c73293d9..5dd36e4b 100644
--- a/src/main/java/com/typesafe/config/impl/PropertiesParser.java
+++ b/src/main/java/com/typesafe/config/impl/PropertiesParser.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.io.IOException;
diff --git a/src/main/java/com/typesafe/config/impl/ResolveStatus.java b/src/main/java/com/typesafe/config/impl/ResolveStatus.java
index 3b6a7535..3f73eb52 100644
--- a/src/main/java/com/typesafe/config/impl/ResolveStatus.java
+++ b/src/main/java/com/typesafe/config/impl/ResolveStatus.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.Collection;
diff --git a/src/main/java/com/typesafe/config/impl/RootConfig.java b/src/main/java/com/typesafe/config/impl/RootConfig.java
index d8f042b9..5bc2291f 100644
--- a/src/main/java/com/typesafe/config/impl/RootConfig.java
+++ b/src/main/java/com/typesafe/config/impl/RootConfig.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigMergeable;
diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfig.java b/src/main/java/com/typesafe/config/impl/SimpleConfig.java
index 02d6351d..605fa09e 100644
--- a/src/main/java/com/typesafe/config/impl/SimpleConfig.java
+++ b/src/main/java/com/typesafe/config/impl/SimpleConfig.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigList.java b/src/main/java/com/typesafe/config/impl/SimpleConfigList.java
index aa341eb5..9e610858 100644
--- a/src/main/java/com/typesafe/config/impl/SimpleConfigList.java
+++ b/src/main/java/com/typesafe/config/impl/SimpleConfigList.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.ArrayList;
diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java b/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
index b1b51409..23fadc06 100644
--- a/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
+++ b/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.AbstractMap;
diff --git a/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java b/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java
index ed23e698..6e377566 100644
--- a/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java
+++ b/src/main/java/com/typesafe/config/impl/SimpleConfigOrigin.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import com.typesafe.config.ConfigOrigin;
diff --git a/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java b/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java
index 1ec58ce6..7f77570d 100644
--- a/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java
+++ b/src/main/java/com/typesafe/config/impl/SubstitutionResolver.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.IdentityHashMap;
diff --git a/src/main/java/com/typesafe/config/impl/Token.java b/src/main/java/com/typesafe/config/impl/Token.java
index 1c863c87..7c888c74 100644
--- a/src/main/java/com/typesafe/config/impl/Token.java
+++ b/src/main/java/com/typesafe/config/impl/Token.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 class Token {
diff --git a/src/main/java/com/typesafe/config/impl/TokenType.java b/src/main/java/com/typesafe/config/impl/TokenType.java
index 72700dba..19b6a106 100644
--- a/src/main/java/com/typesafe/config/impl/TokenType.java
+++ b/src/main/java/com/typesafe/config/impl/TokenType.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 enum TokenType {
diff --git a/src/main/java/com/typesafe/config/impl/Tokenizer.java b/src/main/java/com/typesafe/config/impl/Tokenizer.java
index 1298f3c1..147917bf 100644
--- a/src/main/java/com/typesafe/config/impl/Tokenizer.java
+++ b/src/main/java/com/typesafe/config/impl/Tokenizer.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.io.IOException;
diff --git a/src/main/java/com/typesafe/config/impl/Tokens.java b/src/main/java/com/typesafe/config/impl/Tokens.java
index 8d66bcb5..9ec73a81 100644
--- a/src/main/java/com/typesafe/config/impl/Tokens.java
+++ b/src/main/java/com/typesafe/config/impl/Tokens.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.List;
diff --git a/src/main/java/com/typesafe/config/impl/Unmergeable.java b/src/main/java/com/typesafe/config/impl/Unmergeable.java
index 82dc203e..e0d114e7 100644
--- a/src/main/java/com/typesafe/config/impl/Unmergeable.java
+++ b/src/main/java/com/typesafe/config/impl/Unmergeable.java
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl;
 
 import java.util.Collection;
diff --git a/src/test/scala/ApiExamples.scala b/src/test/scala/ApiExamples.scala
index 3512906d..b716932a 100644
--- a/src/test/scala/ApiExamples.scala
+++ b/src/test/scala/ApiExamples.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 import org.junit.Assert._
 import org.junit._
 import com.typesafe.config._
diff --git a/src/test/scala/Profiling.scala b/src/test/scala/Profiling.scala
index 66baecb1..289aa577 100644
--- a/src/test/scala/Profiling.scala
+++ b/src/test/scala/Profiling.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 object Util {
diff --git a/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala b/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
index 5ce59249..51fb8c2e 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfParserTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala
index 0df93d9f..6b866875 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfigSubstitutionTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
index a67893fb..6717bed5 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfigTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala b/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
index f2fbbe02..c01e3179 100644
--- a/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/ConfigValueTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala b/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala
index 0721fb1e..b3243aa0 100644
--- a/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/EquivalentsTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/JsonTest.scala b/src/test/scala/com/typesafe/config/impl/JsonTest.scala
index ad327cec..d4ad6b78 100644
--- a/src/test/scala/com/typesafe/config/impl/JsonTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/JsonTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/PathTest.scala b/src/test/scala/com/typesafe/config/impl/PathTest.scala
index ee9a5ffb..c5542d5b 100644
--- a/src/test/scala/com/typesafe/config/impl/PathTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/PathTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala b/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala
index 21b138e5..7e953083 100644
--- a/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/PropertiesTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala b/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala
index f457d365..2ff06335 100644
--- a/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/PublicApiTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/TestUtils.scala b/src/test/scala/com/typesafe/config/impl/TestUtils.scala
index 8bdc138f..cff481e3 100644
--- a/src/test/scala/com/typesafe/config/impl/TestUtils.scala
+++ b/src/test/scala/com/typesafe/config/impl/TestUtils.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/TokenTest.scala b/src/test/scala/com/typesafe/config/impl/TokenTest.scala
index f4152540..c7f86281 100644
--- a/src/test/scala/com/typesafe/config/impl/TokenTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/TokenTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala b/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
index f2f946d4..506ae2ee 100644
--- a/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/TokenizerTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert.assertEquals
diff --git a/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala b/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala
index 293a8068..e3cf841b 100644
--- a/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/UnitParserTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._
diff --git a/src/test/scala/com/typesafe/config/impl/UtilTest.scala b/src/test/scala/com/typesafe/config/impl/UtilTest.scala
index 6f04a16f..7ce007c4 100644
--- a/src/test/scala/com/typesafe/config/impl/UtilTest.scala
+++ b/src/test/scala/com/typesafe/config/impl/UtilTest.scala
@@ -1,3 +1,6 @@
+/**
+ *   Copyright (C) 2011 Typesafe Inc. <http://typesafe.com>
+ */
 package com.typesafe.config.impl
 
 import org.junit.Assert._