diff --git a/acl.go b/acl.go
index e0b8451c..9b9a30f6 100644
--- a/acl.go
+++ b/acl.go
@@ -1,5 +1,5 @@
 /*
- * Mini Copy (C) 2014, 2015 Minio, Inc.
+ * Mini Copy (C) 2015 Minio, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/cmd-access.go b/cmd-access.go
index 6df178c6..f24c4524 100644
--- a/cmd-access.go
+++ b/cmd-access.go
@@ -1,3 +1,19 @@
+/*
+ * Mini Copy, (C) 2014, 2015 Minio, Inc.
+ *
+ * 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 main
 
 import (
diff --git a/mock_clientManager_test.go b/mock_clientManager_test.go
index c74a49be..3e203c44 100644
--- a/mock_clientManager_test.go
+++ b/mock_clientManager_test.go
@@ -1,5 +1,5 @@
 /*
- * Mini Copy (C) 2014, 2015 Minio, Inc.
+ * Mini Copy (C) 2015 Minio, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/pkg/client/blockingwriter.go b/pkg/client/blockingwriter.go
index 79917470..bf085c72 100644
--- a/pkg/client/blockingwriter.go
+++ b/pkg/client/blockingwriter.go
@@ -1,3 +1,19 @@
+/*
+ * Mini Copy (C) 2015 Minio, Inc.
+ *
+ * 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 client
 
 import (
diff --git a/pkg/client/mocks/Client.go b/pkg/client/mocks/Client.go
index c4706589..0b28b264 100644
--- a/pkg/client/mocks/Client.go
+++ b/pkg/client/mocks/Client.go
@@ -1,3 +1,19 @@
+/*
+ * Mini Copy (C) 2015 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this fs 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 mocks
 
 import (
diff --git a/pkg/client/mocks/HTTPTracer.go b/pkg/client/mocks/HTTPTracer.go
index 6a2059f7..b20f2a16 100644
--- a/pkg/client/mocks/HTTPTracer.go
+++ b/pkg/client/mocks/HTTPTracer.go
@@ -1,3 +1,19 @@
+/*
+ * Mini Copy (C) 2015 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this fs 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 mocks
 
 import (
diff --git a/pkg/client/mocks/MultipartUpload.go b/pkg/client/mocks/MultipartUpload.go
index f726b26e..166b6d0c 100644
--- a/pkg/client/mocks/MultipartUpload.go
+++ b/pkg/client/mocks/MultipartUpload.go
@@ -1 +1,17 @@
+/*
+ * Mini Copy (C) 2015 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this fs 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 mocks
diff --git a/pkg/client/s3/LICENSE.GOOGLE b/pkg/client/s3/LICENSE.GOOGLE
new file mode 100644
index 00000000..96188b24
--- /dev/null
+++ b/pkg/client/s3/LICENSE.GOOGLE
@@ -0,0 +1,20 @@
+This source was originally based on the following license, but the code
+has diverged much and improved upon.
+
+Keeping this LICENSE here for historical reasons
+
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * 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.
+*/
diff --git a/pkg/client/s3/auth.go b/pkg/client/s3/auth.go
index 07e87393..2b453fa3 100644
--- a/pkg/client/s3/auth.go
+++ b/pkg/client/s3/auth.go
@@ -1,25 +1,3 @@
-// Original license //
-// ---------------- //
-
-/*
-Copyright 2011 Google Inc.
-
-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.
-*/
-
-// All other modifications and improvements //
-// ---------------------------------------- //
-
 /*
  * Mini Copy (C) 2015 Minio, Inc.
  *
diff --git a/pkg/client/s3/auth_test.go b/pkg/client/s3/auth_test.go
index 1d7bca97..41b7d437 100644
--- a/pkg/client/s3/auth_test.go
+++ b/pkg/client/s3/auth_test.go
@@ -1,25 +1,3 @@
-// Original license //
-// ---------------- //
-
-/*
-Copyright 2011 Google Inc.
-
-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.
-*/
-
-// All other modifications and improvements //
-// ---------------------------------------- //
-
 /*
  * Mini Copy (C) 2015 Minio, Inc.
  *
diff --git a/pkg/client/s3/bucket.go b/pkg/client/s3/bucket.go
index 7f44679c..a0abd3b6 100644
--- a/pkg/client/s3/bucket.go
+++ b/pkg/client/s3/bucket.go
@@ -1,25 +1,3 @@
-// Original license //
-// ---------------- //
-
-/*
-Copyright 2011 Google Inc.
-
-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.
-*/
-
-// All other modifications and improvements //
-// ---------------------------------------- //
-
 /*
  * Mini Copy (C) 2015 Minio, Inc.
  *
diff --git a/pkg/client/s3/client.go b/pkg/client/s3/client.go
index 9599a4ec..10c59dc7 100644
--- a/pkg/client/s3/client.go
+++ b/pkg/client/s3/client.go
@@ -1,25 +1,3 @@
-// Original license //
-// ---------------- //
-
-/*
-Copyright 2011 Google Inc.
-
-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.
-*/
-
-// All other modifications and improvements //
-// ---------------------------------------- //
-
 /*
  * Mini Copy (C) 2015 Minio, Inc.
  *
diff --git a/pkg/client/s3/client_test.go b/pkg/client/s3/client_test.go
index 642de6d2..93517b29 100644
--- a/pkg/client/s3/client_test.go
+++ b/pkg/client/s3/client_test.go
@@ -1,25 +1,3 @@
-// Original license //
-// ---------------- //
-
-/*
-Copyright 2011 Google Inc.
-
-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.
-*/
-
-// All other modifications and improvements //
-// ---------------------------------------- //
-
 /*
  * Mini Copy (C) 2015 Minio, Inc.
  *
diff --git a/pkg/client/s3/object_get.go b/pkg/client/s3/object_get.go
index 89aafde9..bb12f77f 100644
--- a/pkg/client/s3/object_get.go
+++ b/pkg/client/s3/object_get.go
@@ -1,25 +1,3 @@
-// Original license //
-// ---------------- //
-
-/*
-Copyright 2011 Google Inc.
-
-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.
-*/
-
-// All other modifications and improvements //
-// ---------------------------------------- //
-
 /*
  * Mini Copy (C) 2015 Minio, Inc.
  *
diff --git a/pkg/client/url.go b/pkg/client/url.go
index 3065cfb3..399244a8 100644
--- a/pkg/client/url.go
+++ b/pkg/client/url.go
@@ -1,5 +1,5 @@
 /*
- * Mini Copy (C) 2014, 2015 Minio, Inc.
+ * Mini Copy (C) 2015 Minio, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.