diff --git a/CHANGELOG b/CHANGELOG
index 3ed41fb7e..22e77563e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Made RPC grinding work from service detection again by changing the
+  looked-for service name from "rpc" to "rpcbind", the name it has in
+  nmap-service-probes. [David]
+
 o [Ndiff] Ndiff now shows changes in script output. [David]
 
 o A bug in Nsock was fixed: On systems where a nonblocking connect
diff --git a/scan_engine.cc b/scan_engine.cc
index 7098deb2b..4504195c2 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -5625,7 +5625,7 @@ void pos_scan(Target *target, u16 *portarray, int numports, stype scantype) {
 	break; // done!
       rsi.rpc_current_port->getServiceDeductions(&sd);
       if (sd.name && sd.service_tunnel == SERVICE_TUNNEL_NONE && 
-	  strcmp(sd.name, "rpc") == 0)
+	  strcmp(sd.name, "rpcbind") == 0)
 	break; // Good - an RPC port for us to scan.
     }