diff --git a/.gitmodules b/.gitmodules
index 23a8d2d..08e1185 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "lib/libepoxy"]
 	path = lib/libepoxy
 	url = https://github.com/anholt/libepoxy.git
+[submodule "lib/lodepng"]
+	path = lib/lodepng
+	url = https://github.com/lvandeve/lodepng.git
diff --git a/lib/lodepng b/lib/lodepng
new file mode 160000
index 0000000..db9cc96
--- /dev/null
+++ b/lib/lodepng
@@ -0,0 +1 @@
+Subproject commit db9cc960fc1fec9075fb455c617a2e0cdd7c6fb2
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 264c863..cc01a3d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,9 @@
 file(GLOB_RECURSE SOURCES *.cc)
 
 include_directories(AFTER "${CMAKE_SOURCE_DIR}/src")
+include_directories(AFTER "${CMAKE_SOURCE_DIR}/lib/lodepng")
 
-add_executable(openrayman ${SOURCES})
+add_executable(openrayman ${SOURCES} "${CMAKE_SOURCE_DIR}/lib/lodepng/lodepng.cpp" "${CMAKE_SOURCE_DIR}/lib/lodepng/lodepng_util.cpp")
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 target_link_libraries(openrayman glfw)