diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 72a98c1..df99716 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,11 @@
-set(TRANSITMAP_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+set(LOOM_INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
-include_directories(${TRANSITMAP_INCLUDE_DIR})
+include_directories(${LOOM_INCLUDE_DIR})
+
+if (LIBZIP_FOUND)
+	include_directories( SYSTEM ${LIBZIP_INCLUDE_DIR} )
+	include_directories( SYSTEM ${LIBZIP_CONF_INCLUDE_DIR} )
+endif( LIBZIP_FOUND )
 
 add_subdirectory(shared)
 add_subdirectory(util)
diff --git a/src/dot/CMakeLists.txt b/src/dot/CMakeLists.txt
index 1259656..bb6ba2f 100644
--- a/src/dot/CMakeLists.txt
+++ b/src/dot/CMakeLists.txt
@@ -6,7 +6,7 @@ list(REMOVE_ITEM dot_SRC ${dot2tg_main})
 list(REMOVE_ITEM dot_SRC TestMain.cpp)
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_subdirectory(tests)
diff --git a/src/dot/tests/CMakeLists.txt b/src/dot/tests/CMakeLists.txt
index c3c2796..eb98945 100644
--- a/src/dot/tests/CMakeLists.txt
+++ b/src/dot/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_executable(dotTest TestMain.cpp)
diff --git a/src/gtfs2graph/tests/CMakeLists.txt b/src/gtfs2graph/tests/CMakeLists.txt
index e7fdac0..823c08a 100644
--- a/src/gtfs2graph/tests/CMakeLists.txt
+++ b/src/gtfs2graph/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_executable(gtfs2graphTest TestMain.cpp)
diff --git a/src/loom/CMakeLists.txt b/src/loom/CMakeLists.txt
index 8180b4f..836d862 100644
--- a/src/loom/CMakeLists.txt
+++ b/src/loom/CMakeLists.txt
@@ -6,7 +6,7 @@ list(REMOVE_ITEM loom_SRC ${loom_main})
 list(REMOVE_ITEM loom_SRC TestMain.cpp)
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 	SYSTEM ${GUROBI_INCLUDE_DIR}
 	SYSTEM ${GLPK_INCLUDE_DIR}
 	SYSTEM ${COIN_INCLUDE_DIR}
diff --git a/src/loom/tests/CMakeLists.txt b/src/loom/tests/CMakeLists.txt
index 7f2543f..1d1dcad 100644
--- a/src/loom/tests/CMakeLists.txt
+++ b/src/loom/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 	)
 
 add_executable(loomTest TestMain.cpp)
diff --git a/src/octi/tests/CMakeLists.txt b/src/octi/tests/CMakeLists.txt
index 423cdcf..601b316 100644
--- a/src/octi/tests/CMakeLists.txt
+++ b/src/octi/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_executable(octiTest TestMain.cpp)
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index 3da0ddc..0fd3431 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -1,7 +1,7 @@
 file(GLOB_RECURSE shared_SRC *.cpp)
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 	SYSTEM ${GUROBI_INCLUDE_DIR}
 	SYSTEM ${GLPK_INCLUDE_DIR}
 	SYSTEM ${COIN_INCLUDE_DIR}
diff --git a/src/shared/tests/CMakeLists.txt b/src/shared/tests/CMakeLists.txt
index a2e9d99..0940f24 100644
--- a/src/shared/tests/CMakeLists.txt
+++ b/src/shared/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_executable(sharedTest TestMain.cpp)
diff --git a/src/topo/CMakeLists.txt b/src/topo/CMakeLists.txt
index 8ad1129..2922444 100644
--- a/src/topo/CMakeLists.txt
+++ b/src/topo/CMakeLists.txt
@@ -6,7 +6,7 @@ list(REMOVE_ITEM topo_SRC ${topo_main})
 list(REMOVE_ITEM topo_SRC TestMain.cpp)
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_subdirectory(tests)
diff --git a/src/topo/tests/CMakeLists.txt b/src/topo/tests/CMakeLists.txt
index a5545e8..48f3317 100644
--- a/src/topo/tests/CMakeLists.txt
+++ b/src/topo/tests/CMakeLists.txt
@@ -2,7 +2,7 @@ file(GLOB_RECURSE test_SRC *.cpp)
 list(REMOVE_ITEM test_SRC TestMain.cpp)
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_executable(topoTest TestMain.cpp)
diff --git a/src/topoeval/CMakeLists.txt b/src/topoeval/CMakeLists.txt
index 53d133e..5fca94f 100644
--- a/src/topoeval/CMakeLists.txt
+++ b/src/topoeval/CMakeLists.txt
@@ -5,7 +5,7 @@ set(topoeval_main TopoEvalMain.cpp)
 list(REMOVE_ITEM topoeval_SRC ${topoeval_main})
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 configure_file (
diff --git a/src/transitmap/CMakeLists.txt b/src/transitmap/CMakeLists.txt
index 3c36220..a1405bc 100644
--- a/src/transitmap/CMakeLists.txt
+++ b/src/transitmap/CMakeLists.txt
@@ -6,7 +6,7 @@ list(REMOVE_ITEM transitmap_SRC ${transitmap_main})
 list(REMOVE_ITEM transitmap_SRC TestMain.cpp)
 
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_subdirectory(output/protobuf)
diff --git a/src/transitmap/tests/CMakeLists.txt b/src/transitmap/tests/CMakeLists.txt
index 06eb495..27f649a 100644
--- a/src/transitmap/tests/CMakeLists.txt
+++ b/src/transitmap/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
 include_directories(
-	${TRANSITMAP_INCLUDE_DIR}
+	${LOOM_INCLUDE_DIR}
 )
 
 add_executable(transitmapTest TestMain.cpp)
diff --git a/src/util b/src/util
index ca6ff4b..916da8c 160000
--- a/src/util
+++ b/src/util
@@ -1 +1 @@
-Subproject commit ca6ff4b855a8f17bbb48f7fd55b5eb391e882c2e
+Subproject commit 916da8c37d292bf0d75ede97c52c480454f7d768