Release mime-types 2.5.

- The home for mime-types has changed. It is no longer
  https://github.com/halostatue/mime-types, but instead
  https://github.com/mime-types/ruby-mime-types.

- Updated the documentation to point to the new home.

8 files changed, 180 insertions, 115 deletions

diff --git a/Contributing.rdoc b/Contributing.rdoc
index 2ce9990..92067f0 100644
--- a/Contributing.rdoc
+++ b/Contributing.rdoc
@@ -88,8 +88,8 @@ Here's the most direct way to get your work merged into the project:
 * Make sure everything still passes by running +rake+.
 * If necessary, rebase your commits into logical chunks, without errors.
 * Push the branch up (<tt>git push origin my\_awesome\_feature</tt>).
-* Create a pull request against halostatue/mime-types and describe what your
-  change does and the why you think it should be merged.
+* Create a pull request against mime-types/ruby-mime-types and describe what
+  your change does and the why you think it should be merged.
 
 === Contributors
 
@@ -105,10 +105,16 @@ Thanks to everyone else who has contributed to mime-types:
 * Hans de Graaff
 * Henrik Hodne
 * Martin d'Allens
-* cgat
+* Chris Gat
 * Greg Brockman
 * Łukasz Śliwa (for the friendly names)
 * Keerthi Siva
 * Aaron Patterson
 * Godfrey Chan
 * Tibor Szolár
+* Ken Ip
+* David Genord
+* Juanito Fatas
+* Andy Brody
+* Aggelow Avgerinos
+* Richard Schneeman
diff --git a/History-Types.rdoc b/History-Types.rdoc
index 79ccd51..f6ebb92 100644
--- a/History-Types.rdoc
+++ b/History-Types.rdoc
@@ -1,35 +1,42 @@
 = MIME Types Changes by Version
 
-== 2.5 / 2015-04-24
+== 2.5 / 2015-04-25
 
 * Updated the IANA media registry entries as of release date:
   * Added MIME types: application/A2L, application/AML, application/ATFX,
-    application/ATXML, application/CDFX+XML, application/CEA, application/DII, 
-    application/DIT, application/jose, application/jose+json,
-    application/json-seq, application/jwk+json, application/jwk-set+json,
-    application/jwt, application/LXF, application/MF4, application/rdap+json,
+    application/ATXML, application/CDFX\+XML, application/CEA, application/DII,
+    application/DIT, application/jose, application/jose\+json,
+    application/json-seq, application/jwk\+json, application/jwk-set\+json,
+    application/jwt, application/LXF, application/MF4, application/rdap\+json,
     application/vnd.apache.thrift.compact, vnd.apache.thrift.json,
-    application/vnd.citationstyles.style+xml, application/vnd.coffeescript,
+    application/vnd.citationstyles.style\+xml, application/vnd.coffeescript,
     application/vnd.enphase.envoy, application/vnd.fastcopy-disk-image,
-    application/vnd.gerber, application/vnd.gov.sk.e-form+xml,
-    application/vnd.gov.sk.e-form+zip,
-    application/vnd.gov.sk.xmldatacontainer+xml, application/vnd.ims.imsccv1p1,
-    application/vnd.ims.imsccv1p2, application/vnd.ims.imsccv1p3,
-    application/vnd.micro+json, application/vnd.microsoft.portable-executable,
-    application/vnd.msa-disk-image, application/vnd.oracle.resource+json,
-    application/vnd.tmd.mediaflex.api+xml, audio/opus, image/vnd.zbrush.pcx,
+    application/vnd.gerber, application/vnd.gov.sk.e-form\+xml,
+    application/vnd.gov.sk.e-form\+zip,
+    application/vnd.gov.sk.xmldatacontainer\+xml,
+    application/vnd.ims.imsccv1p1, application/vnd.ims.imsccv1p2,
+    application/vnd.ims.imsccv1p3, application/vnd.micro\+json,
+    application/vnd.microsoft.portable-executable,
+    application/vnd.msa-disk-image, application/vnd.oracle.resource\+json,
+    application/vnd.tmd.mediaflex.api\+xml, audio/opus, image/vnd.zbrush.pcx,
     text/csv-schema, text/markdown (marked as TEMPORARY).
-  * Updated metadata for application/coap-group+json (RFC7390),
-    application/epub+zip (now registered), application/merge-patch+json
+  * Updated metadata for application/coap-group\+json (RFC7390),
+    application/epub\+zip (now registered), application/merge-patch\+json
     (RFC7396), application/smil, application/vnd.arastra.swi,
-    application/vnd.geocube+xml, application/vnd.gmx, application/xhtml+xml,
+    application/vnd.geocube\+xml, application/vnd.gmx, application/xhtml\+xml,
     text/directory.
+* Andy Brody (@ab) fixed a pair of embarrassing typos in text/csv and
+  text/tab-separated-values,
+  {#89}[https://github.com/mime-types/ruby-mime-types/pull/89].
+* Aggelos Avgerinos (@eavgerinos) added the unregistered MIME type
+  image/x-ms-bmp with the extension +bmp+,
+  {#90}[https://github.com/mime-types/ruby-mime-types/pull/90].
 
 == 2.4.2 / 2014-10-15
 
 * Added application/vnd.ms-outlook as an unregistered MIME type with the
   extension +msg+. Provided by @keerthisiv in
-  {#72}[https://github.com/halostatue/mime-types/pull/72].
+  {#72}[https://github.com/mime-types/ruby-mime-types/pull/72].
 
 == 2.4.1 / 2014-10-07
 
@@ -87,10 +94,10 @@
 == 2.2 / 2014-03-14
 * Added <tt>.sj</tt> to +application/javascript+ as provided by Brandon
   Galbraith (@brandongalbraith) in
-  {#58}[https://github.com/halostatue/mime-types/pull/58].
+  {#58}[https://github.com/mime-types/ruby-mime-types/pull/58].
 * Marked application/excel and application/x-excel as obsolete in favour of
   application/vnd.ms-excel per
-  {#60}[https://github.com/halostatue/mime-types/pull/60].
+  {#60}[https://github.com/mime-types/ruby-mime-types/pull/60].
 * Merged duplicate MIME types into the registered MIME type. The only
   difference between the MIME types was capitalization; the MIME type registry
   is case-preserving.
diff --git a/History.rdoc b/History.rdoc
index 44f2ba3..fef9833 100644
--- a/History.rdoc
+++ b/History.rdoc
@@ -1,15 +1,28 @@
-== NEXT / YYYY-MM-DD
+== 2.5 / 2015-04-25
 
+* Bugs:
+  * David Genord (@albus522) fixed a bug in loading MIME::types cache where a
+    container loaded from cache did not have the expected +default_proc+,
+    {#86}[https://github.com/mime-types/ruby-mime-types/pull/86].
+  * Richard Schneeman (@schneems) provided a patch that substantially reduces
+    unnecessary allocations.
 * Documentation:
-  * Tibor Szolár (@flexik) fixed a typo in the README.
-  * Fixed #80, clarifying the relationship of MIME::Type#content_type and
+  * Tibor Szolár (@flexik) fixed a typo in the README,
+    {#82}[https://github.com/mime-types/ruby-mime-types/pull/82]
+  * Fixed {#80}[https://github.com/mime-types/ruby-mime-types/issues/80],
+    clarifying the relationship of MIME::Type#content_type and
     MIME::Type#simplified, with Ken Ip (@kenips).
+* Development:
+  * Juanito Fatas (@JuanitoFatas) enabled container mode on Travis CI,
+    {#87}[https://github.com/mime-types/ruby-mime-types/pull/87].
+* Moved development to a mime-types organization under
+  {mime-types/ruby-mime-types}[https://github.com/mime-types/ruby-mime-types].
 
 == 2.4.3 / 2014-10-21
 
 * Bugs:
   * Restored Ruby 1.9.2 support by using +private_constant+ conditionally.
-    Fixes {#77}[https://github.com/halostatue/mime-types/issues/77] found by
+    Fixes {#77}[https://github.com/mime-types/ruby-mime-types/issues/77] found by
     Kris Leech (@krisleech). The conditional use of +private_constant+ here
     will be removed for mime-types 3.0, when Ruby 1.9.2 support will be
     unconditionally removed.
@@ -19,10 +32,10 @@
 * Bugs:
   * Aaron Patterson (@tenderlove) found a loading bug and provided a fix that
     nearly doubled registry load performance
-    ({#74}[https://github.com/halostatue/mime-types/pull/74]).
+    ({#74}[https://github.com/mime-types/ruby-mime-types/pull/74]).
   * Godfrey Chan (@chancancode) provided a prophylactic security fix to use
     <tt>JSON.parse</tt> instead of <tt>JSON.load</tt> in
-    {#75}[https://github.com/halostatue/mime-types/pull/75]. This provides a
+    {#75}[https://github.com/mime-types/ruby-mime-types/pull/75]. This provides a
     20% improvement over the already improved result, resulting in a total 55%
     performance boost.
 
@@ -33,7 +46,7 @@ mime-types 2.4 was pulled.
 * Bugs:
   * Restored the extension sort order from mime-types 1.25.1 and modified
     MIME::Type#extensions= to no longer sort extensions when set. This resolves
-    {#71}[https://github.com/halostatue/mime-types/issues/71] and should fix
+    {#71}[https://github.com/mime-types/ruby-mime-types/issues/71] and should fix
     Paperclip.
 * API Changes:
   * Added MIME::Type#preferred_extension to return the preferred extension for
@@ -72,13 +85,13 @@ mime-types 2.4 was pulled.
 == 2.2 / 2014-03-14
 
 * Clarified contribution guidelines for MIME types. Resolves
-  {#57}[https://github.com/halostatue/mime-types/issues/57].
+  {#57}[https://github.com/mime-types/ruby-mime-types/issues/57].
 * Fixed a small bug where deprecated methods would warn of deprecation when
   called by internal methods. Resolves
-  {#60}[https://github.com/halostatue/mime-types/issues/60].
+  {#60}[https://github.com/mime-types/ruby-mime-types/issues/60].
 * Dropped Code Climate; added Coveralls for test coverage reports.
 * Removing external references to RubyForge, as it is shutting down. Resolves
-  {#59}[https://github.com/halostatue/mime-types/issues/59].
+  {#59}[https://github.com/mime-types/ruby-mime-types/issues/59].
 
 == 2.1 / 2014-01-25
 
@@ -112,8 +125,8 @@ mime-types 2.4 was pulled.
   * Construction of a MIME::Type can be with any of the following objects:
     * An array containing a valid content type identifier and an optional array
       of extensions. This allows MIME::Type.new to be used instead of
-      MIME::Type.from_array for the most common use-case. Fixes #43.
-      https://github.com/halostatue/mime-types/pull/43
+      MIME::Type.from_array for the most common use-case. Fixes
+      {#43}[https://github.com/mime-types/ruby-mime-types/pull/43].
     * A Hash containing the output of MIME::Type#to_h, as would be deserialized
       from the JSON representation of a MIME::Type. This replaces
       MIME::Type.from_hash using a different parameter set.
@@ -132,7 +145,7 @@ mime-types 2.4 was pulled.
     MIME::Type#encode_with and MIME::Type#init_with.
   * Implemented JSON hash encoding methods.
   * Added MIME::Type#add_extensions to easily add extensions to a MIME::Type.
-    Fixes #44. https://github.com/halostatue/mime-types/pull/44
+    Fixes {#44}[https://github.com/mime-types/ruby-mime-types/pull/44].
 * API Changes (MIME::Types):
   * MIME type caching has been extracted to its own class. It is structurally
     similar to what was introduced with mime-types 1.25, but is no longer
@@ -144,7 +157,7 @@ mime-types 2.4 was pulled.
   * The MIME::Types#type_for platform parameter has been deprecated.
   * Added the ability for MIME::Types#type_for produce results for multiple
     filenames or extensions by providing an array as the first parameter. Fixes
-    #42. https://github.com/halostatue/mime-types/pull/42
+    {#42}[https://github.com/mime-types/ruby-mime-types/pull/42].
   * MIME::Types#add_type_variant and MIME::Types#index_extensions have been
     deprecated as public methods. They will be private in a future version.
   * MIME::Types#defined_types, MIME::Types.cache_file,
@@ -155,14 +168,15 @@ mime-types 2.4 was pulled.
     MIME::Types::Loader::PATH. +PATH+ is defined in the file
     lib/mime/types/path.rb so that system packagers only have to modify one
     file in order to put the registry in a location that is not where a gem
-    version of mime-types would expect it. This resolves issue #36, reported by
-    postmodern. https://github.com/halostatue/mime-types/pull/36
+    version of mime-types would expect it. This resolves issue
+    {#36}[https://github.com/mime-types/ruby-mime-types/pull/36], reported by
+    @postmodern.
   * The default registry is now a single file in JSON format. This resolves
-    issue #28 reported by jasonlor (an error with mime-types in MacRuby).
-    https://github.com/halostatue/mime-types/pull/28
+    issue {#28}[https://github.com/mime-types/ruby-mime-types/pull/28] reported
+    by @jasonlor (an error with mime-types in MacRuby).
   * The default registry is compiled from YAML files in type-lists/, resolving
-    issue #37 reported by postmodern requesting an easier-to-edit format.
-    https://github.com/halostatue/mime-types/pull/37
+    issue {#37}[https://github.com/mime-types/ruby-mime-types/pull/37]
+    reported by @postmodern requesting an easier-to-edit format.
 * New or Updated MIME Types:
   * Major updates to the registered MIME type list from IANA using the improved
     developer tools.
@@ -216,7 +230,7 @@ mime-types 2.4 was pulled.
 
 * Code Climate:
   * Working on improving the quality of the mime-types codebase through the use
-    of Code Climate. https://codeclimate.com/github/halostatue/mime-types
+    of Code Climate.
   * Simplified MIME::Type.from_array to make more assumptions about assignment.
 * Documentation:
   * LeoYoung <mrleoyoung@gmail.com> pointed out that the README.rdoc contained
@@ -228,10 +242,10 @@ mime-types 2.4 was pulled.
   for most development purposes. This has been removed to ensure that Travis CI
   passes on Ruby 1.8.7.
 * New MIME Types:
-  * 7zip (application/x-7z-compressed). Fixes a request by kodram.
-    https://github.com/halostatue/mime-types/issues/32
-  * application/x-www-form-urlencoded. Fixes a request by alexkwolfe.
-    https://github.com/halostatue/mime-types/issues/39
+  * 7zip (application/x-7z-compressed). Fixes a request by @kodram.
+    {#32}[https://github.com/mime-types/ruby-mime-types/issues/32]
+  * application/x-www-form-urlencoded. Fixes a request by @alexkwolfe.
+    {#39}[https://github.com/mime-types/ruby-mime-types/issues/39]
   * Various new MIME types from IANA:
     * application/mbms-schedule\+xml from 3GPP and Turcotte.
     * application/provenance\+xml from W3C and Herman.
@@ -250,9 +264,10 @@ mime-types 2.4 was pulled.
 == 1.23 / 2013-04-20
 
 * New Feature:
-  * Arnaud Meuret (ameuret) suggested that it could be useful if the MIME type
-    collection was enumerable, so he implemented it in #30. Thanks for the
-    contribution! https://github.com/halostatue/mime-types/pull/30
+  * Arnaud Meuret (@ameuret) suggested that it could be useful if the MIME type
+    collection was enumerable, so he implemented it in
+    {#30}[https://github.com/mime-types/ruby-mime-types/pull/30]. Thanks for
+    the contribution!
 * Updated MIME Types:
   * RFC6910 was adopted (application/call-completion).
   * RFC6902 was adopted (application/json-patch\+json).
@@ -271,7 +286,7 @@ mime-types 2.4 was pulled.
 * New MIME Types:
   * Added support for 3FR (Hasselblad raw images) files. MIME-Type was obtained
     by looking at exif data with exiftool. Thanks to cgat for these changes.
-    https://github.com/halostatue/mime-types/pull/27
+    {#27}[https://github.com/mime-types/ruby-mime-types/pull/27]
 * Updated MIME Types:
     * Pulled the latest updates from the IANA MIME-Type registry.
 * Added support for Ruby 2.0 with Travis CI.
@@ -283,7 +298,8 @@ mime-types 2.4 was pulled.
     application/vnd.ms-fontobject, .eot; application/x-chrome-extension, .crx;
     application/x-web-app-manifest\+json, .webapp; application/x-xpinstall,
     .xpi; image/svg\+xml, .svg, .svgz; image/webp, .webp; text/cache-manifest,
-    .appcache, .manifest. https://github.com/halostatue/mime-types/pull/24
+    .appcache, .manifest.
+    #{24}[https://github.com/mime-types/ruby-mime-types/pull/24]
 * Fixed some Manifest.txt related madness on Travis.
 
 == 1.20.1 / 2013-01-26
@@ -293,18 +309,18 @@ mime-types 2.4 was pulled.
     (application/x-iwork-keynote-sffkey, .key;
     application/x-iwork-pages-sffpages, .pages;
     application/x-iwork-numbers-sffnumbers, .numbers).
-    https://github.com/halostatue/mime-types/issue/20
+    {#20}[https://github.com/mime-types/ruby-mime-types/issue/20]
   * epub, ibooks, mobi, and DMG content types by Mauricio
     Linhares (mac:application/x-apple-diskimage, .dmg; application/epub\+zip,
     .epub; application/x-ibooks\+zip, .ibooks; application/x-mobipocket-ebook,
-    .mobi). https://github.com/halostatue/mime-types/issue/22
+    .mobi). {#22}[https://github.com/mime-types/ruby-mime-types/issue/22]
   * rss content type by Garret Alfert (application/rss\+xml, .rss).
-    https://github.com/halostatue/mime-types/issue/23
+    {#23}[https://github.com/mime-types/ruby-mime-types/issue/23]
   * Added or updated MIME types from the latest IANA list.
 * Fixed MIME Types:
   * Excel macro-enabled spreadsheets had an incorrect extension. Thanks to
     Rafael Belvederese for reporting this issue.
-    https://github.com/halostatue/mime-types/issue/21
+    {#21}[https://github.com/mime-types/ruby-mime-types/issue/21]
 * Enabled for use with travis.
 * Enabled gem signing.
 * Fixed an error related to MIME type downloads.
@@ -312,41 +328,54 @@ mime-types 2.4 was pulled.
 
 == 1.19 / 2012-06-20
 * New MIME Types:
-  * XCF Gnome Images (image/x-xcf, image/x-compressed-xcf; .xcf). https://github.com/halostatue/mime-types/issue/17
-  * Types reported in https://github.com/halostatue/mime-types/issues/12:
+  * XCF Gnome Images (image/x-xcf, image/x-compressed-xcf; .xcf).
+    {#17}[https://github.com/mime-types/ruby-mime-types/issue/17]
+  * Types reported in
+    {#12}[https://github.com/mime-types/ruby-mime-types/issues/12]:
     * DV (video/x-dv; .dv)
     * IVF (video/x-ivf; .ivf)
     * Matroska (video/x-matroska; .mkv)
     * Motion JPEG (video/x-motion-jpeg; .mjpg)
     * RealMedia (official; application/vnd.rn-realmedia; .rm)
 * New extensions:
-  * dcm (application/dicom); https://github.com/halostatue/mime-types/issue/16.
-  * Types reported in https://github.com/halostatue/mime-types/issues/12:
+  * dcm (application/dicom);
+    {#16}[https://github.com/mime-types/ruby-mime-types/issue/16].
+  * Types reported in
+    {#12}[https://github.com/mime-types/ruby-mime-types/issues/12]:
     * 3g2, 3gpp2 (video/3gpp2)
     * mpeg (video/mpeg)
     * mxf (application/mxf)
     * ts (video/MP2T)
     * ogg (video/ogg)
 * Fixed MIME Types:
-  * Adobe AIR application installer packages was missing a hyphen. https://github.com/halostatue/mime-types/issue/13
-  * Types reported in https://github.com/halostatue/mime-types/issues/12:
+  * Adobe AIR application installer packages was missing a hyphen.
+    {#13}[https://github.com/mime-types/ruby-mime-types/issue/13]
+  * Types reported in
+    {#12}[https://github.com/mime-types/ruby-mime-types/issues/12]:
     * audio/x-pn-realaudio extension is .ra, not .rm.
-* Resolved https://github.com/halostatue/mime-types/issues/8. Apparently some people run the tests on Linux. Imagine that.
+* Resolved {#8}[https://github.com/mime-types/ruby-mime-types/issues/8].
+  Apparently some people run the tests on Linux. Imagine that.
 
 == 1.18 / 2012-03-20
 * New MIME Types:
-  * Types reported in https://github.com/halostatue/mime-types/issues/6:
+  * Types reported in
+    #{6}[https://github.com/mime-types/ruby-mime-types/issues/6]:
     * CoffeeScript (text/x-coffeescript; .coffee; 8bit).
     * AIR (application/vnd.adobe.air-applicationinstaller-package\+zip, .air; base64).
     * WOFF (application/font-woff; .woff; base64).
     * TrueType (application/x-font-truetype; .ttf; base64).
     * OpenType (application/x-font-opentype; .otf; base64).
-  * WebM (audio/webm, video/webm; .webm). https://github.com/halostatue/mime-types/issues/11.
+  * WebM (audio/webm, video/webm; .webm).
+    {#11}[https://github.com/mime-types/ruby-mime-types/issues/11.]
 * New extensions:
   * f4v/f4p (video/mp4, used by Adobe); f4a/fb4 (audio/mp4, used by Adobe).
 * Bug Fixes:
-  * It was pointed out that Licence.txt was incorrectly named. Fixed by renaming to Licence.rdoc (from Issue/Pull Request #8, https://github.com/halostatue/mime-types/issues/8).
-  * It was pointed out that a plan to have the test output generated automatically never went through. https://github.com/halostatue/mime-types/issues/10
+  * It was pointed out that Licence.txt was incorrectly named. Fixed by
+    renaming to Licence.rdoc (from Issue/Pull Request
+    {#8}[https://github.com/mime-types/ruby-mime-types/issues/8]).
+  * It was pointed out that a plan to have the test output generated
+    automatically never went through.
+    {#10}[https://github.com/mime-types/ruby-mime-types/issues/10]
 
 == 1.17.2 / 2011-10-25
 * Bug Fixes:
@@ -357,10 +386,13 @@ mime-types 2.4 was pulled.
   * Implemented modern 'hoe' semantics.
   * Switched to minitest instead of test/unit.
   * Converted documentation from .txt to .rdoc.
-  * Removed setup.rb. https://github.com/halostatue/mime-types/issues/3
-  * Should no longer complain about missing RubyGems keys https://github.com/halostatue/mime-types/issues/2
+  * Removed setup.rb.
+    {#3}[https://github.com/mime-types/ruby-mime-types/issues/3]
+  * Should no longer complain about missing RubyGems keys
+    {#2}[https://github.com/mime-types/ruby-mime-types/issues/2]
   * Added .mp4 and .mpg4 as recognized extensions for
-    {application,audio,video}/mp4 per RFC4337. https://github.com/halostatue/mime-types/issues/1
+    (application|audio|video)/mp4 per RFC4337.
+    {#1}[https://github.com/mime-types/ruby-mime-types/issues/1]
   * Added audio/x-aac and .aac per RubyForge issue #28054.
   * Made it much easier to update MIME types from this point forward.
   * Updated MIME types from IANA.
diff --git a/Licence.rdoc b/Licence.rdoc
index 30760ec..10a7327 100644
--- a/Licence.rdoc
+++ b/Licence.rdoc
@@ -2,13 +2,14 @@
 
 This software is available under three licences: the GNU GPL version 2 (or at
 your option, a later version), the Perl Artistic License, or the MIT License.
-Note that my preference for licensing is the MIT License, but the original Perl
-MIME::Types was dually originally licensed with the Perl Artistic Licence and
-the GNU GPL ("the same terms as Perl itself") and given that the Ruby
-implementation hewed pretty closely to the Perl version, I must maintain the
-additional licensing terms.
+The licence preferred by me is the MIT licence.
 
-* Copyright 2003–2014 Austin Ziegler.
+The original Perl MIME::Types was dually originally licensed with the Perl
+Artistic Licence and the GNU GPL ("the same terms as Perl itself") and given
+that the Ruby implementation originally hewed pretty closely to the Perl
+version, I chose to maintain the additional licensing terms.
+
+* Copyright 2003–2015 Austin Ziegler.
 * Adapted from MIME::Types (Perl) by Mark Overmeer.
 
 === MIT License
diff --git a/README.rdoc b/README.rdoc
index e5f3f8e..45a423d 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,11 +1,11 @@
 = mime-types
 
-home :: https://github.com/halostatue/mime-types/
-code :: https://github.com/halostatue/mime-types/
-bugs :: https://github.com/halostatue/mime-types/issues
+home :: https://github.com/mime-types/ruby-mime-types/
+code :: https://github.com/mime-types/ruby-mime-types/
+bugs :: https://github.com/mime-types/ruby-mime-types/issues
 rdoc :: http://rdoc.info/gems/mime-types/
-continuous integration :: {<img src="https://travis-ci.org/halostatue/mime-types.png" />}[https://travis-ci.org/halostatue/mime-types]
-test coverage :: {<img src="https://coveralls.io/repos/halostatue/mime-types/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/halostatue/mime-types]
+continuous integration :: {<img src="https://travis-ci.org/mime-types/ruby-mime-types.png" />}[https://travis-ci.org/mime-types/ruby-mime-types]
+test coverage :: {<img src="https://coveralls.io/repos/mime-types/ruby-mime-types/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/mime-types/ruby-mime-types]
 
 == Description
 
@@ -21,20 +21,40 @@ entities (provided as an enumerable collection of MIME::Type objects) to be
 determined and used programmatically. There are many types defined by RFCs and
 vendors, so the list is long but by definition incomplete; don't hesitate to
 add additional type definitions (see Contributing.rdoc). The primary sources
-for MIME type definitions found in mime-types is the IANA collection of
-registrations (see below for the link), RFCs, and W3C recommendations.
-
-This is release 2.5, …
-
-As a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and
-mime-types 1.x is only being maintained for security issues. No new MIME types
-or features will be added.
-
-mime-types (previously called MIME::Types for Ruby) was originally based on
-MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to
-conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media
-Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml]
-with some types added by the users of mime-types.
+for MIME type definitions found in mime-types is the
+{IANA Media Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml],
+RFCs, and W3C recommendations. It conforms to RFCs 2045 and 2231.
+
+This is release 2.5 with a couple of bug fixes, updating to the latest IANA
+type registry, and adding a user-contributed type. mime-types 2.x supports Ruby
+1.9.2 or later.
+
+=== mime-types 1.x End of Life
+
+mime-types 2.0 was released in late 2013, and as of early 2015 there have been
+no reported security issues for mime-types 1.x. With the release of mime-types
+2.5, I setting the formal End of Life for mime-types 1.x for 2015-10-27 (the
+second anniversary of the release of mime-types 2.0). After this date,
+absolutely no pull requests for mime-types 1.x will be accepted.
+
+=== mime-types Future
+
+Even though there are a number of issues open, it is clear to me that there are
+some fundamental changes that need to happen to both the data representation
+and the API provided by mime-types. This cannot happen under the current
+release, so all new development is focussing on an upcoming 3.0 release. The
+target for the release is on or before the beginning of RubyConf 2015
+(2015-11-15).
+
+When 3.0 is released, mime-types 2.x will receive regular updates of the IANA
+registry for two years following the release. It will also receive security
+updates, if needed, for the same period. There will be no further feature
+development on mime-types 2.x following the 3.0 release.
+
+Coincident with the 3.0 release, I will release mime-types 2.99.0 that no
+longer imports the data to fields that have been deprecated. If they work
+because they derive data from that which is imported, they will continue to
+work. The quarterly updates will be against 2.99.x.
 
 == Synopsis
 
diff --git a/Rakefile b/Rakefile
index 298cd50..3234f10 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,10 +28,10 @@ spec = Hoe.spec 'mime-types' do
   self.extra_dev_deps << ['hoe-rubygems', '~> 1.0']
   self.extra_dev_deps << ['hoe-travis', '~> 1.2']
   self.extra_dev_deps << ['minitest', '~> 5.3']
-  self.extra_dev_deps << ['minitest-autotest', ['>= 1.0.b', '<2']]
+  self.extra_dev_deps << ['minitest-autotest', '~>1.0']
   self.extra_dev_deps << ['rake', '~> 10.0']
   self.extra_dev_deps << ['simplecov', '~> 0.7']
-  self.extra_dev_deps << ['coveralls', '~> 0.7']
+  self.extra_dev_deps << ['coveralls', '~> 0.8']
 end
 
 task :support do
diff --git a/lib/mime/type.rb b/lib/mime/type.rb
index 90fc74a..1113c05 100644
--- a/lib/mime/type.rb
+++ b/lib/mime/type.rb
@@ -56,7 +56,7 @@ class MIME::Type
   end
 
   # The released version of the mime-types library.
-  VERSION = '2.4.3'
+  VERSION = '2.5'
 
   include Comparable
 
diff --git a/mime-types.gemspec b/mime-types.gemspec
index eeb33bf..5de0969 100644
--- a/mime-types.gemspec
+++ b/mime-types.gemspec
@@ -1,68 +1,67 @@
 # -*- encoding: utf-8 -*-
-# stub: mime-types 2.4.3 ruby lib
+# stub: mime-types 2.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mime-types"
-  s.version = "2.4.3"
+  s.version = "2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Austin Ziegler"]
-  s.date = "2014-12-21"
-  s.description = "The mime-types library provides a library and registry for information about\nMIME content type definitions. It can be used to determine defined filename\nextensions for MIME types, or to use filename extensions to look up the likely\nMIME type definitions.\n\nMIME content types are used in MIME-compliant communications, as in e-mail or\nHTTP traffic, to indicate the type of content which is transmitted. The\nmime-types library provides the ability for detailed information about MIME\nentities (provided as an enumerable collection of MIME::Type objects) to be\ndetermined and used programmatically. There are many types defined by RFCs and\nvendors, so the list is long but by definition incomplete; don't hesitate to\nadd additional type definitions (see Contributing.rdoc). The primary sources\nfor MIME type definitions found in mime-types is the IANA collection of\nregistrations (see below for the link), RFCs, and W3C recommendations.\n\nThis is release 2.5, \u{2026}\n\nAs a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and\nmime-types 1.x is only being maintained for security issues. No new MIME types\nor features will be added.\n\nmime-types (previously called MIME::Types for Ruby) was originally based on\nMIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to\nconform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media\nTypes registry}[https://www.iana.org/assignments/media-types/media-types.xhtml]\nwith some types added by the users of mime-types."
+  s.date = "2015-04-25"
+  s.description = "The mime-types library provides a library and registry for information about\nMIME content type definitions. It can be used to determine defined filename\nextensions for MIME types, or to use filename extensions to look up the likely\nMIME type definitions.\n\nMIME content types are used in MIME-compliant communications, as in e-mail or\nHTTP traffic, to indicate the type of content which is transmitted. The\nmime-types library provides the ability for detailed information about MIME\nentities (provided as an enumerable collection of MIME::Type objects) to be\ndetermined and used programmatically. There are many types defined by RFCs and\nvendors, so the list is long but by definition incomplete; don't hesitate to\nadd additional type definitions (see Contributing.rdoc). The primary sources\nfor MIME type definitions found in mime-types is the\n{IANA Media Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml],\nRFCs, and W3C recommendations. It conforms to RFCs 2045 and 2231.\n\nThis is release 2.5 with a couple of bug fixes, updating to the latest IANA\ntype registry, and adding a user-contributed type. mime-types 2.x supports Ruby\n1.9.2 or later."
   s.email = ["halostatue@gmail.com"]
   s.extra_rdoc_files = ["Contributing.rdoc", "History-Types.rdoc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "docs/COPYING.txt", "docs/artistic.txt", "Contributing.rdoc", "History-Types.rdoc", "History.rdoc", "Licence.rdoc", "README.rdoc"]
-  s.files = [".autotest", ".coveralls.yml", ".gemtest", ".hoerc", ".pullreview.yml", ".travis.yml", "Contributing.rdoc", "Gemfile", "History-Types.rdoc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "data/mime-types.json", "docs/COPYING.txt", "docs/artistic.txt", "lib/mime-types.rb", "lib/mime.rb", "lib/mime/type.rb", "lib/mime/types.rb", "lib/mime/types/cache.rb", "lib/mime/types/loader.rb", "lib/mime/types/loader_path.rb", "support/apache_mime_types.rb", "support/benchmarks/load.rb", "support/convert.rb", "support/iana_registry.rb", "test/bad-fixtures/malformed", "test/fixture/json.json", "test/fixture/old-data", "test/fixture/yaml.yaml", "test/minitest_helper.rb", "test/test_mime_type.rb", "test/test_mime_types.rb", "test/test_mime_types_cache.rb", "test/test_mime_types_class.rb", "test/test_mime_types_lazy.rb", "test/test_mime_types_loader.rb"]
-  s.homepage = "https://github.com/halostatue/mime-types/"
+  s.files = [".autotest", ".gemtest", ".gitignore", ".hoerc", "Contributing.rdoc", "History-Types.rdoc", "History.rdoc", "Licence.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "data/mime-types.json", "docs/COPYING.txt", "docs/artistic.txt", "lib/mime-types.rb", "lib/mime.rb", "lib/mime/type.rb", "lib/mime/types.rb", "lib/mime/types/cache.rb", "lib/mime/types/loader.rb", "lib/mime/types/loader_path.rb", "support/apache_mime_types.rb", "support/benchmarks/load.rb", "support/convert.rb", "support/iana_registry.rb", "test/bad-fixtures/malformed", "test/fixture/json.json", "test/fixture/old-data", "test/fixture/yaml.yaml", "test/minitest_helper.rb", "test/test_mime_type.rb", "test/test_mime_types.rb", "test/test_mime_types_cache.rb", "test/test_mime_types_class.rb", "test/test_mime_types_lazy.rb", "test/test_mime_types_loader.rb"]
+  s.homepage = "https://github.com/mime-types/ruby-mime-types/"
   s.licenses = ["MIT", "Artistic 2.0", "GPL-2"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
-  s.rubygems_version = "2.4.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "The mime-types library provides a library and registry for information about MIME content type definitions"
-  s.test_files = ["test/test_mime_type.rb", "test/test_mime_types.rb", "test/test_mime_types_cache.rb", "test/test_mime_types_class.rb", "test/test_mime_types_lazy.rb", "test/test_mime_types_loader.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.4"])
+      s.add_development_dependency(%q<minitest>, ["~> 5.6"])
       s.add_development_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_development_dependency(%q<hoe-doofus>, ["~> 1.0"])
       s.add_development_dependency(%q<hoe-gemspec2>, ["~> 1.1"])
       s.add_development_dependency(%q<hoe-git>, ["~> 1.6"])
       s.add_development_dependency(%q<hoe-rubygems>, ["~> 1.0"])
       s.add_development_dependency(%q<hoe-travis>, ["~> 1.2"])
-      s.add_development_dependency(%q<minitest-autotest>, ["~> 1.0.b"])
+      s.add_development_dependency(%q<minitest-autotest>, ["~> 1.0"])
       s.add_development_dependency(%q<rake>, ["~> 10.0"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.7"])
-      s.add_development_dependency(%q<coveralls>, ["~> 0.7"])
+      s.add_development_dependency(%q<coveralls>, ["~> 0.8"])
       s.add_development_dependency(%q<hoe>, ["~> 3.13"])
     else
-      s.add_dependency(%q<minitest>, ["~> 5.4"])
+      s.add_dependency(%q<minitest>, ["~> 5.6"])
       s.add_dependency(%q<rdoc>, ["~> 4.0"])
       s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
       s.add_dependency(%q<hoe-gemspec2>, ["~> 1.1"])
       s.add_dependency(%q<hoe-git>, ["~> 1.6"])
       s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
       s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
-      s.add_dependency(%q<minitest-autotest>, ["~> 1.0.b"])
+      s.add_dependency(%q<minitest-autotest>, ["~> 1.0"])
       s.add_dependency(%q<rake>, ["~> 10.0"])
       s.add_dependency(%q<simplecov>, ["~> 0.7"])
-      s.add_dependency(%q<coveralls>, ["~> 0.7"])
+      s.add_dependency(%q<coveralls>, ["~> 0.8"])
       s.add_dependency(%q<hoe>, ["~> 3.13"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 5.4"])
+    s.add_dependency(%q<minitest>, ["~> 5.6"])
     s.add_dependency(%q<rdoc>, ["~> 4.0"])
     s.add_dependency(%q<hoe-doofus>, ["~> 1.0"])
     s.add_dependency(%q<hoe-gemspec2>, ["~> 1.1"])
     s.add_dependency(%q<hoe-git>, ["~> 1.6"])
     s.add_dependency(%q<hoe-rubygems>, ["~> 1.0"])
     s.add_dependency(%q<hoe-travis>, ["~> 1.2"])
-    s.add_dependency(%q<minitest-autotest>, ["~> 1.0.b"])
+    s.add_dependency(%q<minitest-autotest>, ["~> 1.0"])
     s.add_dependency(%q<rake>, ["~> 10.0"])
     s.add_dependency(%q<simplecov>, ["~> 0.7"])
-    s.add_dependency(%q<coveralls>, ["~> 0.7"])
+    s.add_dependency(%q<coveralls>, ["~> 0.8"])
     s.add_dependency(%q<hoe>, ["~> 3.13"])
   end
 end