diff --git a/ChangeLog b/ChangeLog
index 9f31e661e1..dca8c57784 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 31 21:47:56 2012  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/test/unit/test-unit.gemspec: Make test/unit default gem.
+	  [Feature #6875] [ruby-dev:46051]
+
 Fri 31 Aug 2012 18:35:02 AM CEST  BOSSLET, Martin  <Martin.Bosslet@googlemail.com>
 
 	* ext/openssl/extconf.rb: Check existence of OPENSSL_NPN_NEGOTIATED.
diff --git a/lib/test/unit/test-unit.gemspec b/lib/test/unit/test-unit.gemspec
new file mode 100644
index 0000000000..6c7d22379d
--- /dev/null
+++ b/lib/test/unit/test-unit.gemspec
@@ -0,0 +1,14 @@
+# -*- ruby -*-
+
+Gem::Specification.new do |s|
+  s.name = "test-unit"
+  s.version = "#{RUBY_VERSION}.0"
+  s.homepage = "http://www.ruby-lang.org"
+  s.author = "Shota Fukumori"
+  s.email = "sorah@tubusu.net"
+  s.summary = "test/unit compatible API testing framework"
+  s.description =
+    "This library implements test/unit compatible API on minitest. " +
+    "The test/unit means that test/unit which was bundled with Ruby 1.8."
+  s.executables = ["testrb"]
+end