diff --git a/CHANGELOG b/CHANGELOG
index 6076a73aa..7bbb684e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NSE] Changed ip-geolocation-geoplugin to use the web service's new
+  output format. Reported by Robin Wood.
+
 o Limited the number of open sockets in ultra_scan to FD_SETSIZE. Very
   fast connect scans could write past the end of an fd_set and cause a
   variety of crashes:
diff --git a/scripts/ip-geolocation-geoplugin.nse b/scripts/ip-geolocation-geoplugin.nse
index 7475c1404..93d432f33 100644
--- a/scripts/ip-geolocation-geoplugin.nse
+++ b/scripts/ip-geolocation-geoplugin.nse
@@ -38,7 +38,7 @@ end
 -- No limit on requests
 local geoplugin = function(ip)
 	local response = http.get("www.geoplugin.net", 80, "/json.gp?ip="..ip, nil)
-	local stat, loc = json.parse(response.body:match("geoPlugin%((.+)%)"))
+	local stat, loc = json.parse(response.body)
 	if not stat then return nil end
 	
 	local output = {}