5 files changed, 20 insertions, 15 deletions
diff --git a/runlevels/Makefile b/runlevels/Makefile
index ae4fff1d..782638b2 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -15,7 +15,26 @@ MK=		../mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/gitignore.mk
-include Makefile.${OS}
+
+ifeq ($(OS),BSD)
+BOOT+=		hostid newsyslog savecore syslogd swap-blk
+else ifeq ($(OS),FreeBSD)
+# Generic BSD stuff
+BOOT+=		hostid net.lo0 newsyslog savecore syslogd
+
+# FreeBSD specific stuff
+BOOT+=		adjkerntz dumpon syscons
+else ifeq ($(OS),Linux)
+SYSINIT+=	devfs dmesg
+BOOT+=		hwclock keymaps modules mtab procfs termencoding
+SHUTDOWN+=	killprocs mount-ro
+else ifeq ($(OS),NetBSD)
+# Generic BSD stuff
+BOOT+=		hostid net.lo0 newsyslog savecore syslogd
+
+# NetBSD specific stuff
+BOOT+=		devdb swap-blk ttys wscons
+endif
 
 all:
 
diff --git a/runlevels/Makefile.BSD b/runlevels/Makefile.BSD
deleted file mode 100644
index ffa758c1..00000000
--- a/runlevels/Makefile.BSD
+++ /dev/null
@@ -1 +0,0 @@
-BOOT+=		hostid newsyslog savecore syslogd swap-blk
diff --git a/runlevels/Makefile.FreeBSD b/runlevels/Makefile.FreeBSD
deleted file mode 100644
index 614e965b..00000000
--- a/runlevels/Makefile.FreeBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-# Generic BSD stuff
-BOOT+=		hostid net.lo0 newsyslog savecore syslogd
-
-# FreeBSD specific stuff
-BOOT+=		adjkerntz dumpon syscons
diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux
deleted file mode 100644
index 251c6b8b..00000000
--- a/runlevels/Makefile.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-SYSINIT+=	devfs dmesg
-BOOT+=		hwclock keymaps modules mtab procfs termencoding
-SHUTDOWN+=	killprocs mount-ro
diff --git a/runlevels/Makefile.NetBSD b/runlevels/Makefile.NetBSD
deleted file mode 100644
index d76ccea6..00000000
--- a/runlevels/Makefile.NetBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-# Generic BSD stuff
-BOOT+=		hostid net.lo0 newsyslog savecore syslogd
-
-# NetBSD specific stuff
-BOOT+=		devdb swap-blk ttys wscons