diff --git a/.gitmodules b/.gitmodules
index 240184a..0daa23b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "lib/mstch"]
 	path = lib/mstch
 	url = https://github.com/KingDuckZ/mstch.git
+[submodule "lib/houdini/houdini"]
+	path = lib/houdini/houdini
+	url = https://github.com/vmg/houdini.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21a37f0..0c7f88e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,4 +6,5 @@ set(TAWASHI_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")
 
 add_subdirectory(lib/incredis)
 add_subdirectory(lib/mstch)
+add_subdirectory(lib/houdini)
 add_subdirectory(src)
diff --git a/lib/houdini/CMakeLists.txt b/lib/houdini/CMakeLists.txt
new file mode 100644
index 0000000..91b2237
--- /dev/null
+++ b/lib/houdini/CMakeLists.txt
@@ -0,0 +1,21 @@
+cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+project(houdini C)
+
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wextra -Wno-missing-field-initializers")
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -Wextra -Wno-missing-field-initializers")
+
+add_library(${PROJECT_NAME} STATIC
+	houdini/buffer.c
+	houdini/houdini_href_e.c
+	houdini/houdini_html_e.c
+	houdini/houdini_html_u.c
+	houdini/houdini_js_e.c
+	houdini/houdini_js_u.c
+	houdini/houdini_uri_e.c
+	houdini/houdini_uri_u.c
+	houdini/houdini_xml_e.c
+)
+
+target_include_directories(${PROJECT_NAME}
+	PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/houdini
+)
diff --git a/lib/houdini/houdini b/lib/houdini/houdini
new file mode 160000
index 0000000..59727b8
--- /dev/null
+++ b/lib/houdini/houdini
@@ -0,0 +1 @@
+Subproject commit 59727b85553b70d468743076219e620d6c0d3cad
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 74bc18d..a784187 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,6 +52,7 @@ target_link_libraries(${PROJECT_NAME}
 	PRIVATE ${CURL_LIBRARIES}
 	PRIVATE ${SourceHighlight_LIBRARIES}
 	PRIVATE mstch
+	PRIVATE houdini
 )
 target_compile_definitions(${PROJECT_NAME}
 	PRIVATE BOOST_SPIRIT_USE_PHOENIX_V3=1