diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index 5a99d81912a0f7..ba6981bfbdda7a 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -96,8 +96,6 @@ Zachary Scott (zzak)
   _unmaintained_
 [lib/optparse.rb, lib/optparse/*]
   Nobuyuki Nakada (nobu)
-[lib/ostruct.rb]
-  Marc-Andre Lafortune (marcandre)
 [lib/pp.rb]
   Tanaka Akira (akr)
 [lib/prettyprint.rb]
@@ -211,6 +209,8 @@ Zachary Scott (zzak)
   https://github.com/ruby/fileutils
 [lib/logger.rb]
   Naotoshi Seo (sonots)
+[lib/ostruct.rb]
+  Marc-Andre Lafortune (marcandre)
 [lib/prime.rb]
   Yuki Sonoda (yugui)
 [lib/rdoc.rb, lib/rdoc/*]
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index 692859775eb333..102f757c0d9c2b 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -37,7 +37,6 @@ Observable:: Provides a mechanism for publish/subscribe pattern in Ruby
 OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
 Open3:: Provides access to stdin, stdout and stderr when running other programs
 OptionParser:: Ruby-oriented class for command-line option analysis
-OpenStruct:: Class to build custom data structures, similar to a Hash
 PP:: Provides a PrettyPrinter for Ruby objects
 PrettyPrinter:: Implements a pretty printing algorithm for readable structure
 profile.rb:: Runs the Ruby Profiler__
@@ -92,6 +91,7 @@ CMath:: Provides Trigonometric and Transcendental functions for complex numbers
 CSV:: Provides an interface to read and write CSV files and data
 FileUtils:: Several file utility methods for copying, moving, removing, etc
 Logger:: Provides a simple logging utility for outputting messages
+OpenStruct:: Class to build custom data structures, similar to a Hash
 Prime:: Prime numbers and factorization library
 RDoc:: Produces HTML and command-line documentation for Ruby
 REXML:: An XML toolkit for Ruby
diff --git a/lib/ostruct.gemspec b/lib/ostruct.gemspec
new file mode 100644
index 00000000000000..4faf5b84aa16ce
--- /dev/null
+++ b/lib/ostruct.gemspec
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+Gem::Specification.new do |spec|
+  spec.name          = "ostruct"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Marc-Andre Lafortune"]
+  spec.email         = ["ruby-core@marc-andre.ca"]
+
+  spec.summary       = %q{Class to build custom data structures, similar to a Hash.}
+  spec.description   = %q{Class to build custom data structures, similar to a Hash.}
+  spec.homepage      = "https://github.com/ruby/ostruct"
+  spec.license       = "BSD-2-Clause"
+
+  spec.files         = [".gitignore", ".travis.yml", "Gemfile", "LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup", "lib/ostruct.rb", "ostruct.gemspec"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+end