diff --git a/cmake/FindLibZip.cmake b/cmake/FindLibZip.cmake
index 0dc4c70..b6f4237 100644
--- a/cmake/FindLibZip.cmake
+++ b/cmake/FindLibZip.cmake
@@ -46,6 +46,7 @@ IF (LIBZIP_FOUND)
   MESSAGE(STATUS "Found libzip: ${LIBZIP_LIBRARY}")
 ELSE (LIBZIP_FOUND)
   SET(LIBZIP_LIBRARY "")
-  SET(LIBZIP_INCLUDE_DIRS "")
+  SET(LIBZIP_INCLUDE_DIR "")
+  SET(LIBZIP_CONF_INCLUDE_DIR "")
   MESSAGE(STATUS "Could not find libzip")
 ENDIF (LIBZIP_FOUND)
diff --git a/src/cppgtfs b/src/cppgtfs
index 354fc1d..21f511f 160000
--- a/src/cppgtfs
+++ b/src/cppgtfs
@@ -1 +1 @@
-Subproject commit 354fc1d68dd8a1cff43ae2cec9a4d294eabcb0c9
+Subproject commit 21f511f4cff44bff275b2e6e456b7b30ed07d6f1
diff --git a/src/pfaedle/CMakeLists.txt b/src/pfaedle/CMakeLists.txt
index 4d31bc1..e36ccf1 100644
--- a/src/pfaedle/CMakeLists.txt
+++ b/src/pfaedle/CMakeLists.txt
@@ -6,6 +6,8 @@ list(REMOVE_ITEM pfaedle_SRC ${pfaedle_main})
 
 include_directories(
 	${PFAEDLE_INCLUDE_DIR}
+	SYSTEM ${LIBZIP_INCLUDE_DIR}
+	SYSTEM ${LIBZIP_CONF_INCLUDE_DIR}
 )
 
 configure_file (