diff --git a/lib/java/src/TApplicationException.java b/lib/java/src/TApplicationException.java
index b9c0d3d..fdce9f5 100644
--- a/lib/java/src/TApplicationException.java
+++ b/lib/java/src/TApplicationException.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift;
 
 import com.facebook.thrift.protocol.TField;
diff --git a/lib/java/src/TException.java b/lib/java/src/TException.java
index 2dbcf39..77eed3e 100644
--- a/lib/java/src/TException.java
+++ b/lib/java/src/TException.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift;
 
 /**
diff --git a/lib/java/src/TProcessor.java b/lib/java/src/TProcessor.java
index 08817ee..973f1d0 100644
--- a/lib/java/src/TProcessor.java
+++ b/lib/java/src/TProcessor.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift;
 
 import com.facebook.thrift.protocol.TProtocol;
diff --git a/lib/java/src/protocol/TBinaryProtocol.java b/lib/java/src/protocol/TBinaryProtocol.java
index 08f6e55..4ba0941 100644
--- a/lib/java/src/protocol/TBinaryProtocol.java
+++ b/lib/java/src/protocol/TBinaryProtocol.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/protocol/TField.java b/lib/java/src/protocol/TField.java
index d32d708..85675e0 100644
--- a/lib/java/src/protocol/TField.java
+++ b/lib/java/src/protocol/TField.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TList.java b/lib/java/src/protocol/TList.java
index 0528619..d1c7642 100644
--- a/lib/java/src/protocol/TList.java
+++ b/lib/java/src/protocol/TList.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TMap.java b/lib/java/src/protocol/TMap.java
index e8d18e1..0a0e4df 100644
--- a/lib/java/src/protocol/TMap.java
+++ b/lib/java/src/protocol/TMap.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TMessage.java b/lib/java/src/protocol/TMessage.java
index 92f4f8b..9f1fec1 100644
--- a/lib/java/src/protocol/TMessage.java
+++ b/lib/java/src/protocol/TMessage.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TMessageType.java b/lib/java/src/protocol/TMessageType.java
index 0e0b8fd..2b4c8cd 100644
--- a/lib/java/src/protocol/TMessageType.java
+++ b/lib/java/src/protocol/TMessageType.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TProtocol.java b/lib/java/src/protocol/TProtocol.java
index 502f473..23829cf 100644
--- a/lib/java/src/protocol/TProtocol.java
+++ b/lib/java/src/protocol/TProtocol.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/protocol/TProtocolException.java b/lib/java/src/protocol/TProtocolException.java
index fa172de..efc54b4 100644
--- a/lib/java/src/protocol/TProtocolException.java
+++ b/lib/java/src/protocol/TProtocolException.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/protocol/TProtocolFactory.java b/lib/java/src/protocol/TProtocolFactory.java
index 9ca3c9e..09ffb22 100644
--- a/lib/java/src/protocol/TProtocolFactory.java
+++ b/lib/java/src/protocol/TProtocolFactory.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 import com.facebook.thrift.transport.TTransport;
diff --git a/lib/java/src/protocol/TProtocolUtil.java b/lib/java/src/protocol/TProtocolUtil.java
index c83950d..935163c 100644
--- a/lib/java/src/protocol/TProtocolUtil.java
+++ b/lib/java/src/protocol/TProtocolUtil.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/protocol/TSet.java b/lib/java/src/protocol/TSet.java
index 542f3f5..c40ef71 100644
--- a/lib/java/src/protocol/TSet.java
+++ b/lib/java/src/protocol/TSet.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TStruct.java b/lib/java/src/protocol/TStruct.java
index b8b94ce..6832bab 100644
--- a/lib/java/src/protocol/TStruct.java
+++ b/lib/java/src/protocol/TStruct.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/protocol/TType.java b/lib/java/src/protocol/TType.java
index bed9a21..4a0f0d0 100644
--- a/lib/java/src/protocol/TType.java
+++ b/lib/java/src/protocol/TType.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.protocol;
 
 /**
diff --git a/lib/java/src/server/TServer.java b/lib/java/src/server/TServer.java
index 8e21e11..9dcbff6 100644
--- a/lib/java/src/server/TServer.java
+++ b/lib/java/src/server/TServer.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.server;
 
 import com.facebook.thrift.TProcessor;
diff --git a/lib/java/src/server/TSimpleServer.java b/lib/java/src/server/TSimpleServer.java
index 7058295..902c596 100644
--- a/lib/java/src/server/TSimpleServer.java
+++ b/lib/java/src/server/TSimpleServer.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.server;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/server/TThreadPoolServer.java b/lib/java/src/server/TThreadPoolServer.java
index 560a3cc..9eaf9b8 100644
--- a/lib/java/src/server/TThreadPoolServer.java
+++ b/lib/java/src/server/TThreadPoolServer.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.server;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/transport/TFramedTransport.java b/lib/java/src/transport/TFramedTransport.java
index 260fd80..9eb068d 100644
--- a/lib/java/src/transport/TFramedTransport.java
+++ b/lib/java/src/transport/TFramedTransport.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 import java.io.ByteArrayInputStream;
diff --git a/lib/java/src/transport/THttpClient.java b/lib/java/src/transport/THttpClient.java
index 77ffe62..aa0f0a3 100644
--- a/lib/java/src/transport/THttpClient.java
+++ b/lib/java/src/transport/THttpClient.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 import java.io.ByteArrayOutputStream;
diff --git a/lib/java/src/transport/TIOStreamTransport.java b/lib/java/src/transport/TIOStreamTransport.java
index a32195b..e9998b9 100644
--- a/lib/java/src/transport/TIOStreamTransport.java
+++ b/lib/java/src/transport/TIOStreamTransport.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 import java.io.IOException;
diff --git a/lib/java/src/transport/TServerSocket.java b/lib/java/src/transport/TServerSocket.java
index 6cbd0c1..9badf1a 100644
--- a/lib/java/src/transport/TServerSocket.java
+++ b/lib/java/src/transport/TServerSocket.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 import java.io.IOException;
diff --git a/lib/java/src/transport/TServerTransport.java b/lib/java/src/transport/TServerTransport.java
index 6faeaab..2ffc8df 100644
--- a/lib/java/src/transport/TServerTransport.java
+++ b/lib/java/src/transport/TServerTransport.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 /**
diff --git a/lib/java/src/transport/TSocket.java b/lib/java/src/transport/TSocket.java
index a2aa233..2c17e43 100644
--- a/lib/java/src/transport/TSocket.java
+++ b/lib/java/src/transport/TSocket.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 import java.io.BufferedInputStream;
diff --git a/lib/java/src/transport/TTransport.java b/lib/java/src/transport/TTransport.java
index 890a810..8322b33 100644
--- a/lib/java/src/transport/TTransport.java
+++ b/lib/java/src/transport/TTransport.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 /**
diff --git a/lib/java/src/transport/TTransportException.java b/lib/java/src/transport/TTransportException.java
index 5d9e371..5b035f9 100644
--- a/lib/java/src/transport/TTransportException.java
+++ b/lib/java/src/transport/TTransportException.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 import com.facebook.thrift.TException;
diff --git a/lib/java/src/transport/TTransportFactory.java b/lib/java/src/transport/TTransportFactory.java
index 5654b1f..cbe5808 100644
--- a/lib/java/src/transport/TTransportFactory.java
+++ b/lib/java/src/transport/TTransportFactory.java
@@ -1,3 +1,9 @@
+// Copyright (c) 2006- Facebook
+// Distributed under the Thrift Software License
+//
+// See accompanying file LICENSE or visit the Thrift site at:
+// http://developers.facebook.com/thrift/
+
 package com.facebook.thrift.transport;
 
 /**