diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7b62c60
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libpidutil"]
+	path = libpidutil
+	url = https://github.com/farrokhi/libpidutil.git
diff --git a/Makefile b/Makefile
index 6e5b675..e16a84e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,22 @@
-PREFIX?=/usr/local
-INC=-I$(PREFIX)/include
-LIB=-L$(PREFIX)/lib  -lpidutil
-FLAGS=-Wall -Wextra -O2 -pipe -funroll-loops -ffast-math -fno-strict-aliasing -mssse3
 CC?=cc
+PREFIX?=/usr/local
+CPPFLAGS=-I$(PREFIX)/include
+LDFLAGS=-L$(PREFIX)/lib  
+LDLIBS=-lpidutil
+FLAGS=-Wall -Wextra -O2 -pipe -funroll-loops -ffast-math -fno-strict-aliasing -mssse3
 
-all: ifstatd_
+.PHONY: libpidutil get-deps
 
-ifstatd_: ifstatd.c Makefile 
-	$(CC) $(FLAGS) $(INC) $(LIB) ifstatd.c -o ifstatd_
+all: get-deps libpidutil ifstatd_
+
+ifstatd_: ifstatd.o
+
+get-deps:
+	git submodule update --init
+
+libpidutil:
+	$(MAKE) -C libpidutil all
 
 clean:
-	rm -f ifstatd_
-
+	rm -f *.BAK *.log *.o *.a core ifstatd_
+	$(MAKE) -C libpidutil clean
diff --git a/libpidutil b/libpidutil
new file mode 160000
index 0000000..6c886a4
--- /dev/null
+++ b/libpidutil
@@ -0,0 +1 @@
+Subproject commit 6c886a4584028724e80d8e5010126916114275aa