diff --git a/README.md b/README.md
index 67fb58f7b952c7fe6d14cdd114aff8921731c114..cf21b6809394de5a6019b39ee78bd88a2d6d9c9f 100644
--- a/README.md
+++ b/README.md
@@ -753,31 +753,17 @@ This uses the PostcodeAnywhere UK Geocode service, this will geocode any string
 
 ### IP Address Services
 
-#### Ipstack (`:ipstack`)
+#### IPInfo.io (`:ipinfo_io`)
 
-* **API key**: required - see https://ipstack.com/product
-* **Quota**: 10,000 requests per month (with free API Key, 50,000/day and up for paid plans)
+* **API key**: optional - see http://ipinfo.io/pricing
+* **Quota**: 1,000/day - more with api key
 * **Region**: world
-* **SSL support**: yes ( only with paid plan )
-* **Languages**: English, German, Spanish, French, Japanese, Portugues (Brazil), Russian, Chinese
-* **Documentation**: https://ipstack.com/documentation
-* **Terms of Service**: ?
-* **Limitations**: ?
-* **Notes**: To use Ipstack set `Geocoder.configure(:ip_lookup => :ipstack, :api_key => "your_ipstack_api_key")`. Support for the ipstack JSONP, batch lookup, and requester lookup features has not been implemented yet.  This lookup does support the params shown below:
-* ```ruby
-    # Search Options Examples
-
-    Geocoder.search('0.0.0.0', { 
-        params: {
-            hostname: '1', 
-            security: '1', 
-            fields: 'country_code,location.capital,...', # see ipstack documentation
-            language: 'en'
-        }
-    })
-    ```
+* **SSL support**: no (not without access key - see http://ipinfo.io/pricing)
+* **Languages**: English
+* **Documentation**: http://ipinfo.io/developers
+* **Terms of Service**: http://ipinfo.io/developers
 
-#### FreeGeoIP (`:freegeoip`) - DEPRECATED ( [ more information](https://github.com/alexreisner/geocoder/wiki/Freegeoip-Discontinuation) )
+#### FreeGeoIP (`:freegeoip`) - [DISCONTINUED](https://github.com/alexreisner/geocoder/wiki/Freegeoip-Discontinuation)
 
 * **API key**: none
 * **Quota**: 15,000 requests per hour. After reaching the hourly quota, all of your requests will result in HTTP 403 (Forbidden) until it clears up on the next roll over.
@@ -850,15 +836,17 @@ This uses the PostcodeAnywhere UK Geocode service, this will geocode any string
 * **Limitations**: ?
 * **Notes**: You must specify which MaxMind service you are using in your configuration, and also basic authentication. For example: `Geocoder.configure(:maxmind_geoip2 => {:service => :country, :basic_auth => {:user => '', :password => ''}})`.
 
-#### IPInfo.io (`:ipinfo_io`)
+#### Ipstack (`:ipstack`)
 
-* **API key**: optional - see http://ipinfo.io/pricing
-* **Quota**: 1,000/day - more with api key
+* **API key**: required (see https://ipstack.com/product)
+* **Quota**: 10,000 requests per month (with free API Key, 50,000/day and up for paid plans)
 * **Region**: world
-* **SSL support**: no (not without access key - see http://ipinfo.io/pricing)
-* **Languages**: English
-* **Documentation**: http://ipinfo.io/developers
-* **Terms of Service**: http://ipinfo.io/developers
+* **SSL support**: yes ( only with paid plan )
+* **Languages**: English, German, Spanish, French, Japanese, Portugues (Brazil), Russian, Chinese
+* **Documentation**: https://ipstack.com/documentation
+* **Terms of Service**: ?
+* **Limitations**: ?
+* **Notes**: To use Ipstack set `Geocoder.configure(:ip_lookup => :ipstack, :api_key => "your_ipstack_api_key")`. Supports the optional params: `:hostname`, `:security`, `:fields`, `:language` (see API documentation for details).
 
 #### IP-API.com (`:ipapi_com`)
 
diff --git a/geocoder.gemspec b/geocoder.gemspec
index 7488885ca218f0c8fa2593e9effce6e37d4b4bb4..9a4fd52d1150570d4b90acb7442168a2487fd717 100644
--- a/geocoder.gemspec
+++ b/geocoder.gemspec
@@ -21,12 +21,7 @@ Gem::Specification.new do |s|
 
   s.post_install_message = %q{
 
-IMPORTANT: Geocoder has recently switched its default ip lookup.  If you have specified :freegeoip
-in your configuration, you must choose a different ip lookup by July 1, 2018, which is when
-the Freegeoip API will be discontinued.
-
-For more information visit:
-https://github.com/alexreisner/geocoder/wiki/Freegeoip-Discontinuation
+NOTE: Geocoder's default IP address lookup has changed from FreeGeoIP.net to IPInfo.io. If you explicitly specify :freegeoip in your configuration you must choose a different IP lookup before FreeGeoIP is discontinued on July 1, 2018. If you do not explicitly specify :freegeoip you do not need to change anything.
 
 }