diff --git a/Makefile b/Makefile
index 14aed3a..a5d2317 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 src_dir=`pwd`
+bin_dir=$(src_dir)/bin
 
 .PHONY: all clean
 
@@ -21,15 +22,19 @@ mss_clean:
 	$(MAKE) -C mss clean
 
 pncc: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss pncc
 
 norfolk: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss norfolk
 
 cook: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss cook
 
 zed: plat_all
+	if [ ! -d $(bin_dir) ]; then mkdir $(bin_dir); fi
 	$(MAKE) -C mss zed
 
 plat_all:
diff --git a/mss/pps/lib/.gitkeep b/mss/pps/lib/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/mss/pps/ut/.gitkeep b/mss/pps/ut/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/plat/diameter/makefile b/plat/diameter/makefile
index b09decb..d3195c7 100644
--- a/plat/diameter/makefile
+++ b/plat/diameter/makefile
@@ -19,11 +19,11 @@ CFLAGS=-Wall -g -DDEBUG -DX86_64 -lm -lrt -ldl -lsctp -lgcrypt -lgnutls -lpthrea
 CC=gcc
 
 $(TGT):$(OBJS)
-#	$(CC) -o $(TGT) $(CFLAGS) $(MAIN) $(SRCS) $(INCDIR) $(LIBS)
-#	chmod a+x $(TGT)
-	ar r ./lib/libdiameter.a $(OBJS)
+	if [ ! -d $(TOPDIR)/lib ]; then mkdir $(TOPDIR)/lib; fi
+	$(AR) -rcs $(TOPDIR)/lib/libdiameter.a $(OBJS)
 
 $(OBJS):%.o:%.c
 	$(CC) $(CFLAGS) -c -o $@ $< $(INCDIR)
+	
 clean:
 	rm -rf $(OBJS) $(TGT)