diff -ur net-misc.orig/clocksd/clocksd-0.25.ebuild net-misc/clocksd/clocksd-0.25.ebuild
--- net-misc.orig/clocksd/clocksd-0.25.ebuild	2004-09-28 11:31:22.542689736 -0300
+++ net-misc/clocksd/clocksd-0.25.ebuild	2004-09-28 15:28:09.000000000 -0300
@@ -93,3 +93,11 @@
 	einfo ""
 }
 
+pkg_prerm() {
+	rm -f /service/clockspeed
+	rm -f /service/clockspeed_adjust
+	svc -dx /etc/clocksd/services/clockspeed_adjust
+	svc -dx /etc/clocksd/services/clockspeed_adjust/log
+	svc -dx /etc/clocksd/services/clockspeed
+}
+
diff -ur net-misc.orig/clocksd/files/clocksd.startup net-misc/clocksd/files/clocksd.startup
--- net-misc.orig/clocksd/files/clocksd.startup	2004-09-28 10:42:52.170164552 -0300
+++ net-misc/clocksd/files/clocksd.startup	2004-09-28 15:28:39.000000000 -0300
@@ -6,8 +6,8 @@
 # link clockspeed service into $SERVICE:
 #
 ln -s ${CLOCKSPEED_SERVICES}/clockspeed ${SERVICE}
-echo "Waiting for clockspeed startup by svscan: 6 seconds. Please wait..."
-sleep 6
+echo "Waiting for clock initial adjustment and clockspeed startup by svscan: 15 seconds. Please wait..."
+sleep 15
 
 # after clockspeed service has started, give user "clocksd" write
 # access to the named pipe read by clockspeed: