diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6180c617b4010fe8f911cf17ed42e4334d2cedd5..14709fc24fce119f99e23f4697267af0f7a9b1a8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -219,13 +219,13 @@ endif
 	@$(MAKE) -C tmcd client-install
 
 subboss: client
+	@$(MAKE) -C os subboss
 	@$(MAKE) -C utils subboss
 
 subboss-install: subboss
 ifeq ($(EVENTSYS),1)
 	@$(MAKE) -C event client-install
 endif
-	@$(MAKE) -C os client-install
 ifneq ($(SYSTEM),CYGWIN_NT-5.1)
 	@$(MAKE) -C capture client-install
 	@$(MAKE) -C tip client-install
@@ -233,6 +233,7 @@ ifneq ($(SYSTEM),CYGWIN_NT-5.1)
 endif
 	@$(MAKE) -C sensors client-install
 	@$(MAKE) -C utils subboss-install
+	@$(MAKE) -C os subboss-install
 	@$(MAKE) -C db subboss-install
 	@$(MAKE) -C tmcd subboss-install
 	@$(MAKE) -C rc.d subboss-install
diff --git a/os/GNUmakefile.in b/os/GNUmakefile.in
index 6eb2af8f230a6197aeae12815777072e14c8bce9..fa55973c25ff6c3b372ef5957ba6a1fe88d2588c 100644
--- a/os/GNUmakefile.in
+++ b/os/GNUmakefile.in
@@ -60,6 +60,16 @@ endif
 	$(MAKE) -C dijkstra client-install
 	$(MAKE) -C genhostsfile client-install
 
+subboss: client
+	$(MAKE) -C frisbee.redux all
+
+subboss-install: subboss client-install
+ifeq ($(SYSTEM),FreeBSD)
+	CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux install
+else
+	CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux install
+endif
+
 mfs:
 	$(MAKE) -C imagezip client
 	$(MAKE) -C zapdisk mfs