diff --git a/CMakeLists.txt b/CMakeLists.txt
index f71efdb..9037b07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
 
 # now build our various libraries, agents, binaries.
 # DO NOT ALTER (SO)VERSION ON LIBRARIES WITHOUT ASKING!
-foreach (LIBRARY xpl streamio msgapi connio util json cal mailauth sieve sasl)
+foreach (LIBRARY xpl streamio msgapi connio util json cal mailauth sieve sasl collectoraccounts)
 	add_subdirectory (src/libs/${LIBRARY})
 	set(LIBRARY_TARGET bongo${LIBRARY})
 	if(LIBRARY STREQUAL "sieve")
diff --git a/src/agents/collector/CMakeLists.txt b/src/agents/collector/CMakeLists.txt
index 056c237..65ca8fb 100644
--- a/src/agents/collector/CMakeLists.txt
+++ b/src/agents/collector/CMakeLists.txt
@@ -1,24 +1,9 @@
 StrictCompile()
 
-set(EXTERNAL_ACCOUNTS_SQL_C ${CMAKE_CURRENT_BINARY_DIR}/external-accounts-sql.c)
-add_custom_command(
-    OUTPUT ${EXTERNAL_ACCOUNTS_SQL_C}
-    COMMAND ${CMAKE_COMMAND}
-            -DINPUT=${CMAKE_CURRENT_SOURCE_DIR}/external-accounts.sql
-            -DOUTPUT=${EXTERNAL_ACCOUNTS_SQL_C}
-            -DSYMBOL=sql_external_accounts
-            -P ${CMAKE_SOURCE_DIR}/cmake/EmbedFile.cmake
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/external-accounts.sql
-            ${CMAKE_SOURCE_DIR}/cmake/EmbedFile.cmake
-    VERBATIM
-)
-
 add_executable(bongocollector
 	collector.c
-	external_accounts.c
 	external_store.c
 	external_transport.c
-	${EXTERNAL_ACCOUNTS_SQL_C}
 )
 
 target_link_libraries(bongocollector
@@ -27,7 +12,7 @@ target_link_libraries(bongocollector
     bongoutil
     bongostreamio
     bongomsgapi
-    ${GCRYPT_LIBRARIES}
+    bongocollectoraccounts
     ${CURL_LIBRARIES}
     ${SQLITE_LIBRARIES}
 )
diff --git a/src/libs/collectoraccounts/CMakeLists.txt b/src/libs/collectoraccounts/CMakeLists.txt
new file mode 100644
index 0000000..d8acdeb
--- /dev/null
+++ b/src/libs/collectoraccounts/CMakeLists.txt
@@ -0,0 +1,30 @@
+set(EXTERNAL_ACCOUNTS_SQL_C ${CMAKE_CURRENT_BINARY_DIR}/external-accounts-sql.c)
+add_custom_command(
+    OUTPUT ${EXTERNAL_ACCOUNTS_SQL_C}
+    COMMAND ${CMAKE_COMMAND}
+            -DINPUT=${CMAKE_SOURCE_DIR}/src/agents/collector/external-accounts.sql
+            -DOUTPUT=${EXTERNAL_ACCOUNTS_SQL_C}
+            -DSYMBOL=sql_external_accounts
+            -P ${CMAKE_SOURCE_DIR}/cmake/EmbedFile.cmake
+    DEPENDS ${CMAKE_SOURCE_DIR}/src/agents/collector/external-accounts.sql
+            ${CMAKE_SOURCE_DIR}/cmake/EmbedFile.cmake
+    VERBATIM
+)
+
+add_library(bongocollectoraccounts SHARED
+    ${CMAKE_SOURCE_DIR}/src/agents/collector/external_accounts.c
+    ${EXTERNAL_ACCOUNTS_SQL_C}
+)
+
+target_include_directories(bongocollectoraccounts PUBLIC
+    ${CMAKE_SOURCE_DIR}/src/agents/collector
+)
+
+target_link_libraries(bongocollectoraccounts
+    bongoxpl
+    bongoutil
+    ${GCRYPT_LIBRARIES}
+    ${SQLITE_LIBRARIES}
+)
+
+install(TARGETS bongocollectoraccounts DESTINATION ${LIB_INSTALL_DIR})