diff --git a/conf.d.FreeBSD/Makefile b/conf.d.FreeBSD/Makefile
new file mode 100644
index 00000000..c48abbfa
--- /dev/null
+++ b/conf.d.FreeBSD/Makefile
@@ -0,0 +1,5 @@
+DIR=	/etc/conf.d
+CONF=	${CONTENTS} 
+
+MK=	../mk
+include ${MK}/scripts.mk
diff --git a/conf.d.BSD/syscons b/conf.d.FreeBSD/syscons
similarity index 100%
rename from conf.d.BSD/syscons
rename to conf.d.FreeBSD/syscons
diff --git a/etc.BSD/Makefile b/etc.BSD/Makefile
index 639b927c..cb466dc0 100644
--- a/etc.BSD/Makefile
+++ b/etc.BSD/Makefile
@@ -1,6 +1,5 @@
 DIR=	/etc
-CONF=	devd.conf rc rc.shutdown
-BIN=	rc.devd
+CONF=	$(CONTENTS)
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/etc.FreeBSD/Makefile b/etc.FreeBSD/Makefile
new file mode 100644
index 00000000..b4e8b069
--- /dev/null
+++ b/etc.FreeBSD/Makefile
@@ -0,0 +1,6 @@
+DIR=	/etc
+CONF=	devd.conf
+BIN=	rc.devd
+
+MK=	../mk
+include ${MK}/scripts.mk
diff --git a/etc.BSD/devd.conf b/etc.FreeBSD/devd.conf
similarity index 100%
rename from etc.BSD/devd.conf
rename to etc.FreeBSD/devd.conf
diff --git a/etc.BSD/rc.devd b/etc.FreeBSD/rc.devd
similarity index 100%
rename from etc.BSD/rc.devd
rename to etc.FreeBSD/rc.devd
diff --git a/init.d.FreeBSD/Makefile b/init.d.FreeBSD/Makefile
new file mode 100644
index 00000000..da0be63d
--- /dev/null
+++ b/init.d.FreeBSD/Makefile
@@ -0,0 +1,5 @@
+DIR=	/etc/init.d
+BIN=	${CONTENTS} 
+
+MK=	../mk
+include ${MK}/scripts.mk
diff --git a/init.d.BSD/devd b/init.d.FreeBSD/devd
similarity index 100%
rename from init.d.BSD/devd
rename to init.d.FreeBSD/devd
diff --git a/init.d.BSD/dumpon b/init.d.FreeBSD/dumpon
old mode 100755
new mode 100644
similarity index 100%
rename from init.d.BSD/dumpon
rename to init.d.FreeBSD/dumpon
diff --git a/init.d.BSD/ipfw b/init.d.FreeBSD/ipfw
similarity index 100%
rename from init.d.BSD/ipfw
rename to init.d.FreeBSD/ipfw
diff --git a/init.d.BSD/nscd b/init.d.FreeBSD/nscd
similarity index 100%
rename from init.d.BSD/nscd
rename to init.d.FreeBSD/nscd
diff --git a/init.d.BSD/syscons b/init.d.FreeBSD/syscons
similarity index 100%
rename from init.d.BSD/syscons
rename to init.d.FreeBSD/syscons
diff --git a/runlevels.BSD/Makefile b/runlevels.BSD/Makefile
index 0abbb19e..7e8bbef1 100644
--- a/runlevels.BSD/Makefile
+++ b/runlevels.BSD/Makefile
@@ -1,5 +1,5 @@
-BOOT=		dumpon hostid net.lo0 newsyslog savecore syscons syslogd
+BOOT=		hostid net.lo0 newsyslog savecore syslogd
 DEFAULT=	local.rc mixer powerd 
 
-MK=			../mk
+MK=		../mk
 include ${MK}/runlevels.mk
diff --git a/runlevels.FreeBSD/Makefile b/runlevels.FreeBSD/Makefile
new file mode 100644
index 00000000..f258ba9a
--- /dev/null
+++ b/runlevels.FreeBSD/Makefile
@@ -0,0 +1,4 @@
+BOOT=	dumpon hostid syscons
+
+MK=	../mk
+include ${MK}/runlevels.mk