diff --git a/wscript b/wscript
index 15f0fcf..c949474 100644
--- a/wscript
+++ b/wscript
@@ -6,22 +6,19 @@
 
 def options(opt):
     opt.load('compiler_c compiler_cxx boost protoc qt4')
+
+    opt.load('tinyxml', tooldir=['waf-tools'])
     
 def configure(conf):
-    conf.load("compiler_c compiler_cxx")
+    conf.load("compiler_c compiler_cxx boost protoc qt4 tinyxml")
 
     conf.add_supported_cxxflags (cxxflags = ['-O3', '-g'])
 
-    conf.load('protoc')
-
-    conf.load('qt4')
-
-    conf.load('boost')
-
+    conf.check_tinyxml(path=conf.options.tinyxml_dir)
     conf.check_cfg(package='libndn.cxx', args=['--cflags', '--libs'], uselib_store='NDNCXX', mandatory=True)
     conf.check_cfg(package='sqlite3', args=['--cflags', '--libs'], uselib_store='SQLITE3', mandatory=True)
 
-    conf.check_boost(lib='system random thread')
+    conf.check_boost(lib='system random thread filesystem')
 
     conf.write_config_header('config.h')
 
@@ -33,7 +30,7 @@
         defines = "WAF",
         source = bld.path.ant_glob(['src/*.cpp', 'src/*.ui']),
         includes = ".",
-        use = "QTCORE QTGUI SQLITE3 NDNCXX",
+        use = "QTCORE QTGUI SQLITE3 NDNCXX TINYXML BOOST BOOST_FILESYSTEM",
         )