diff --git a/Makefile b/Makefile
index 0d9251d8..54951ba4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,10 @@ CC=gcc
 CFLAGS=-Wall -Wextra -std=c99
 
 ifeq ($(findstring CYGWIN,$(shell uname -s)), CYGWIN)
+  XFILE_LIB=cygxfile.dll
   PICRIN_LIB=cygpicrin.dll
 else
+  XFILE_LIB=libxfile.so
   PICRIN_LIB=libpicrin.so
 endif
 
@@ -11,6 +13,7 @@ all: deps release
 
 deps:
 	git submodule update --init
+	$(CC) $(CFLAGS) -shared -fPIC extlib/xfile/*.c -o lib/$(XFILE_LIB) -I./extlib/xfile
 
 release: CFLAGS += -DDEBUG=0 -O3
 release: build
@@ -21,13 +24,13 @@ debug: build
 build: build-lib build-main
 
 build-main:
-	$(CC) $(CFLAGS) tools/main.c src/*.c -o bin/picrin -I./include -I./extlib -lreadline -lm
+	$(CC) $(CFLAGS) tools/main.c src/*.c -o bin/picrin -I./include -I./extlib -L./extlib -lreadline -lm -lxfile
 
 build-lib:
 	cd src; \
 	  yacc -d parse.y; \
 	  flex scan.l
-	$(CC) $(CFLAGS) -shared -fPIC src/*.c -o lib/$(PICRIN_LIB) -I./include -I./extlib -lm
+	$(CC) $(CFLAGS) -shared -fPIC src/*.c -o lib/$(PICRIN_LIB) -I./include -I./extlib -L./lib -lm -lxfile
 
 clean:
 	rm -f src/y.tab.c src/y.tab.h src/lex.yy.c