diff --git a/Makefile b/Makefile
index c8800f00a7efb82b9547cdd3282e8bc74a58820d..e0c4bebe35eed5b635bed75d3f2ea782b466ec8d 100644
--- a/Makefile
+++ b/Makefile
@@ -47,9 +47,10 @@ install: all
 	install -c tbsetup/ir/extract_tb.tcl /usr/testbed/bin
 	install -c tbsetup/ir/handle_ip.tcl /usr/testbed/bin
 	install -c tbsetup/ns2ir/parse.tcl /usr/testbed/bin
+	@$(MAKE) -C tbsetup/checkpass install
 
 
-all: lib/sql.so assign/assign discvr/cli discvr/serv os/key7 os/key8 os/imagezip/imagezip
+all: lib/sql.so assign/assign discvr/cli discvr/serv os/key7 os/key8 os/imagezip/imagezip tbsetup/checkpass/checkpass
 
 lib/sql.so:
 	@$(MAKE) -C lib sql.so
@@ -72,11 +73,15 @@ os/key8:
 os/imagezip/imagezip:
 	@$(MAKE) -C os/imagezip imagezip
 
+tbsetup/checkpass/checkpass:
+	@$(MAKE) -C tbsetup/checkpass checkpass
+
 clean:
 	@$(MAKE) -C assign clean
 	@$(MAKE) -C discvr clean
 	@$(MAKE) -C os  clean
 	@$(MAKE) -C os/imagezip clean
-
+	@$(MAKE) -C tbsetup/checkpass clean
+	
 
 
diff --git a/tbsetup/checkpass/Makefile b/tbsetup/checkpass/Makefile
index a452ae9bc62f22955a33f6aba3874e293a766de8..de8d8d83d78ed592ff6704aba15237a89bcd5d0b 100644
--- a/tbsetup/checkpass/Makefile
+++ b/tbsetup/checkpass/Makefile
@@ -7,12 +7,12 @@ checkpass: cracklib
 	${CC} -g checkpass.c cracklib,2.7/cracklib/libcrack.a -o checkpass -lm
 
 cracklib:
-	(cd cracklib,2.7/ && make all && cd ..)
+	gmake -C cracklib,2.7 all
 
 install:
 	install -c checkpass /usr/testbed/bin
 
 clean:
-	(cd cracklib,2.7/ && make clean && cd ..)
+	gmake -C cracklib,2.7 clean
 	/bin/rm -f *.o checkpass
 
diff --git a/tbsetup/checkpass/cracklib,2.7/Makefile b/tbsetup/checkpass/cracklib,2.7/Makefile
index 1b7457f7dad74787b6c3db1960310ad16828df00..c0b4626556b2ce9e90f40098d8a3a7160af74cd3 100644
--- a/tbsetup/checkpass/cracklib,2.7/Makefile
+++ b/tbsetup/checkpass/cracklib,2.7/Makefile
@@ -24,15 +24,12 @@ default:
 	@echo "you evidently don't know what you're doing. go read the README"
 
 all:
-	( cd cracklib && make && exit $$? )
-	( cd util && make DICTPATH=$(DICTPATH) && exit $$? )
-###	( cd passwd && make DICTPATH=$(DICTPATH) passwd && exit $$? )
-###	touch all
+	gmake -C cracklib
+	gmake -C util DICTPATH=$(DICTPATH) 
 
 clean:
-	-( cd cracklib && make clean && exit $$? )
-	-( cd util && make clean && exit $$? )
-###	-( cd passwd && make clean && exit $$? )
+	gmake -C cracklib clean 
+	gmake -C util clean 
 	-rm -f all installed Part* *.BAK *.bak *~
 
 install: all