diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..92231ef
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "third-party/libpqxx"]
+	path = third-party/libpqxx
+	url = https://github.com/jtv/libpqxx
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b898d88..35f36b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,6 +69,8 @@ set(CMAKE_INSTALL_PREFIX $ENV{ACT_HOME} CACHE PATH "installation path" FORCE)
 
 add_subdirectory(src)
 
+add_subdirectory(third-party/libpqxx build-pqxx EXCLUDE_FROM_ALL)
+
 # Link the needed libraries into it
 target_link_libraries(
         ${PROJECT_NAME}
@@ -79,7 +81,7 @@ target_link_libraries(
 # Add the Postgresql library
 target_link_libraries(
         ${PROJECT_NAME}
-        -lpqxx -lpq
+        pqxx
 )
 
 # specify install targets
diff --git a/third-party/libpqxx b/third-party/libpqxx
new file mode 160000
index 0000000..6af956b
--- /dev/null
+++ b/third-party/libpqxx
@@ -0,0 +1 @@
+Subproject commit 6af956bb48167ed1e71cc0f0c2d8c8fdc99151a3