diff --git a/jf-live-writer/CMakeLists.txt b/jf-live-writer/CMakeLists.txt
index f96af5a..b6f1045 100644
--- a/jf-live-writer/CMakeLists.txt
+++ b/jf-live-writer/CMakeLists.txt
@@ -1,17 +1,29 @@
+find_package(MPI REQUIRED)
+# Because of openmpi.
+add_definitions(-DOMPI_SKIP_MPICXX)
+
 file(GLOB SOURCES
         src/*.cpp)
 
 add_library(jf-live-writer-lib STATIC ${SOURCES})
-target_include_directories(jf-live-writer-lib PUBLIC include/)
+target_include_directories(jf-live-writer-lib
+        PUBLIC include/
+        SYSTEM ${MPI_INCLUDE_PATH})
+
 target_link_libraries(jf-live-writer-lib
         external
-        core-buffer-lib)
+        core-buffer-lib
+        ${MPI_LIBRARIES}
+        )
 
 add_executable(jf-live-writer src/main.cpp)
 set_target_properties(jf-live-writer PROPERTIES OUTPUT_NAME jf_live_writer)
 target_link_libraries(jf-live-writer
         jf-live-writer-lib
         zmq
+        hdf5
+        hdf5_hl
+        hdf5_cpp
         rt
         )