diff --git a/init.d.BSD/syslogd b/init.d.BSD/syslogd
index 9336a413..5f362fee 100644
--- a/init.d.BSD/syslogd
+++ b/init.d.BSD/syslogd
@@ -4,7 +4,7 @@
 
 command=/usr/sbin/syslogd
 command_args=${syslogd_args}
-pidfile=/var/run/syslogd.pid
+pidfile=$(strings ${command} | grep /var/run/syslog)
 name="System Logger Daemon"
 
 depend()
diff --git a/init.d.BSD/mixer b/init.d.FreeBSD/mixer
similarity index 100%
rename from init.d.BSD/mixer
rename to init.d.FreeBSD/mixer
diff --git a/init.d.BSD/powerd b/init.d.FreeBSD/powerd
similarity index 100%
rename from init.d.BSD/powerd
rename to init.d.FreeBSD/powerd
diff --git a/runlevels/Makefile.BSD b/runlevels/Makefile.BSD
index 255d117a..fdadb407 100644
--- a/runlevels/Makefile.BSD
+++ b/runlevels/Makefile.BSD
@@ -1,2 +1 @@
 BOOT+=		hostid net.lo0 newsyslog savecore syslogd
-DEFAULT+=	local.rc mixer powerd 
diff --git a/runlevels/Makefile.FreeBSD b/runlevels/Makefile.FreeBSD
index 85d15fe1..dbb0765f 100644
--- a/runlevels/Makefile.FreeBSD
+++ b/runlevels/Makefile.FreeBSD
@@ -1 +1,2 @@
-BOOT+=	clock dumpon syscons
+BOOT+=		clock dumpon syscons
+DEFAULT+=	mixer powerd