diff --git a/lib/rb/COPYING b/lib/rb/COPYING
index 0101a7d..280b3d6 100644
--- a/lib/rb/COPYING
+++ b/lib/rb/COPYING
@@ -1,24 +1,14 @@
-Thrift Software License
-Copyright (c) 2006- Facebook, Inc.
+Apache Software License
+Copyright (c) 2006- Facebook, Inc. et al.
 
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
+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
 
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+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/lib/rb/LICENSE b/lib/rb/LICENSE
index 0101a7d..280b3d6 100644
--- a/lib/rb/LICENSE
+++ b/lib/rb/LICENSE
@@ -1,24 +1,14 @@
-Thrift Software License
-Copyright (c) 2006- Facebook, Inc.
+Apache Software License
+Copyright (c) 2006- Facebook, Inc. et al.
 
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
+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
 
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
+    http://www.apache.org/licenses/LICENSE-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
+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/lib/rb/lib/thrift.rb b/lib/rb/lib/thrift.rb
index 53fd9fd..7d916c5 100644
--- a/lib/rb/lib/thrift.rb
+++ b/lib/rb/lib/thrift.rb
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
 #
 # See accompanying file LICENSE or visit the Thrift site at:
 # http://developers.facebook.com/thrift/
diff --git a/lib/rb/lib/thrift/protocol.rb b/lib/rb/lib/thrift/protocol.rb
index d28ae51..98ccb72 100644
--- a/lib/rb/lib/thrift/protocol.rb
+++ b/lib/rb/lib/thrift/protocol.rb
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
 #
 # See accompanying file LICENSE or visit the Thrift site at:
 # http://developers.facebook.com/thrift/
diff --git a/lib/rb/lib/thrift/protocol/binaryprotocol.rb b/lib/rb/lib/thrift/protocol/binaryprotocol.rb
index b6f1ada..8b9cec0 100644
--- a/lib/rb/lib/thrift/protocol/binaryprotocol.rb
+++ b/lib/rb/lib/thrift/protocol/binaryprotocol.rb
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
 #
 # See accompanying file LICENSE or visit the Thrift site at:
 # http://developers.facebook.com/thrift/
diff --git a/lib/rb/lib/thrift/server.rb b/lib/rb/lib/thrift/server.rb
index 62d210b..19de6cd 100644
--- a/lib/rb/lib/thrift/server.rb
+++ b/lib/rb/lib/thrift/server.rb
@@ -1,5 +1,5 @@
 # Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
 #
 # See accompanying file LICENSE or visit the Thrift site at:
 # http://developers.facebook.com/thrift/
diff --git a/lib/rb/lib/thrift/transport.rb b/lib/rb/lib/thrift/transport.rb
index 14e9dbe..3ea6ee0 100644
--- a/lib/rb/lib/thrift/transport.rb
+++ b/lib/rb/lib/thrift/transport.rb
@@ -1,5 +1,5 @@
 # Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
 #
 # See accompanying file LICENSE or visit the Thrift site at:
 # http://developers.facebook.com/thrift/
diff --git a/lib/rb/lib/thrift/transport/socket.rb b/lib/rb/lib/thrift/transport/socket.rb
index 636244c..ea3175c 100644
--- a/lib/rb/lib/thrift/transport/socket.rb
+++ b/lib/rb/lib/thrift/transport/socket.rb
@@ -1,5 +1,5 @@
 # Copyright (c) 2006- Facebook
-# Distributed under the Thrift Software License
+# Distributed under the Apache Software License
 #
 # See accompanying file LICENSE or visit the Thrift site at:
 # http://developers.facebook.com/thrift/