diff --git a/Makefile b/Makefile
index 8786e05..8982382 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 CC       = gcc
-CFLAGS   = -O2 -Werror `mysql_config --cflags`
+CFLAGS   = -O2 -Werror `mysql_config --cflags` -Ilib
 LD		 = $(CC)
 LDFLAGS  = -L/usr/lib/mysql -lmysqlclient
 
@@ -28,6 +28,9 @@ endif
 
 obj =
 
+obj += lib/ini/iniparser.o
+obj += lib/ini/dictionary.o
+
 obj += src/rbtree.o
 obj += src/path.o
 obj += src/strbuf.o
@@ -40,8 +43,6 @@ obj += src/event.o
 obj += src/fscrawl.o
 obj += src/queue.o
 
-obj += src/ini/iniparser.o
-obj += src/ini/dictionary.o
 obj += src/archived.o
 
 .PHONY : all clean cleaner
diff --git a/src/ini/AUTHORS b/lib/ini/AUTHORS
similarity index 100%
rename from src/ini/AUTHORS
rename to lib/ini/AUTHORS
diff --git a/src/ini/LICENSE b/lib/ini/LICENSE
similarity index 100%
rename from src/ini/LICENSE
rename to lib/ini/LICENSE
diff --git a/src/ini/dictionary.c b/lib/ini/dictionary.c
similarity index 100%
rename from src/ini/dictionary.c
rename to lib/ini/dictionary.c
diff --git a/src/ini/dictionary.h b/lib/ini/dictionary.h
similarity index 100%
rename from src/ini/dictionary.h
rename to lib/ini/dictionary.h
diff --git a/src/ini/iniparser.c b/lib/ini/iniparser.c
similarity index 100%
rename from src/ini/iniparser.c
rename to lib/ini/iniparser.c
diff --git a/src/ini/iniparser.h b/lib/ini/iniparser.h
similarity index 100%
rename from src/ini/iniparser.h
rename to lib/ini/iniparser.h
diff --git a/src/archived.c b/src/archived.c
index 247db58..73b2d38 100644
--- a/src/archived.c
+++ b/src/archived.c
@@ -18,10 +18,10 @@
 #include <signal.h>
 
 #include <mysql/mysql.h>
+#include <ini/iniparser.h>
 
 #include "notify.h"
 #include "xalloc.h"
-#include "ini/iniparser.h"
 #include "util.h"
 #include "debug.h"