diff --git a/ChangeLog b/ChangeLog
index ae87274e..ae62c339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo System Intialization ("rc") scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
 
+  02 Jul 2007; Roy Marples <uberlord@gentoo.org>:
+
+    Don't wait for services that were inactive, #183667 thanks to Daniel Drake
+
   30 Jun 2007; Roy Marples <uberlord@gentoo.org>:
 
     Don't set an early font if consolefont isn't in a runlevel, #183773.
diff --git a/src/runscript.c b/src/runscript.c
index 18515372..8bebf746 100644
--- a/src/runscript.c
+++ b/src/runscript.c
@@ -656,8 +656,13 @@ static void svc_start (bool deps)
 		tmplist = NULL;
 
 		STRLIST_FOREACH (services, svc, i) {
-			if (rc_service_state (svc, rc_service_started))
+			/* don't wait for services which went inactive but are now in
+			 * starting state */
+			if (rc_service_state (svc, rc_service_started) ||
+				(rc_service_state (svc, rc_service_starting) &&
+				 rc_service_state(svc, rc_service_wasinactive)))
 				continue;
+			
 			if (! rc_wait_service (svc))
 				eerror ("%s: timed out waiting for %s", applet, svc);
 			if (rc_service_state (svc, rc_service_started))