diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b9d151..aafc412 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,8 +43,14 @@ else ()
   target_link_libraries(squawk PRIVATE QXmpp::QXmpp)
 endif ()
 
+# Signal
 if (NOT SYSTEM_SIGNAL)
   add_subdirectory(external/signal-protocol-c)
+  add_dependencies(squawk signal-protocol-c)
+  target_link_libraries(squawk PRIVATE signal-protocol-c)
+else ()
+  find_package(Signal REQUIRED)
+  target_link_libraries(squawk PRIVATE Signal::Signal)
 endif ()
 
 ## KIO
@@ -73,9 +79,6 @@ if (WITH_KWALLET)
   endif ()
 endif ()
 
-## Signal (TODO)
-# find_package(Signal REQUIRED)
-
 ## LMDB
 find_package(LMDB REQUIRED)
 
diff --git a/qomemo/CMakeLists.txt b/qomemo/CMakeLists.txt
index 0837eac..dc0e0ea 100644
--- a/qomemo/CMakeLists.txt
+++ b/qomemo/CMakeLists.txt
@@ -1,25 +1 @@
-cmake_minimum_required(VERSION 3.3)
-project(qomemo)
-
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-set(CMAKE_AUTOMOC ON)
-
-find_package(Qt5Core CONFIG REQUIRED)
-find_package(Qt5Xml CONFIG REQUIRED)
-find_package(LMDB REQUIRED)
-
-set(qomemo_SRC signal.h)
-
-add_library(qomemo STATIC ${qomemo_SRC})
-
-if(SYSTEM_QXMPP)
-    get_target_property(QXMPP_INTERFACE_INCLUDE_DIRECTORIES QXmpp::QXmpp INTERFACE_INCLUDE_DIRECTORIES)
-    target_include_directories(qomemo PUBLIC ${QXMPP_INTERFACE_INCLUDE_DIRECTORIES})
-endif()
-
-target_include_directories(qomemo PUBLIC ${CMAKE_SOURCE_DIR}/external/signal-protocol-c/src)
-
-target_link_libraries(qomemo Qt5::Core)
-target_link_libraries(qomemo Qt5::Xml)
-target_link_libraries(qomemo qxmpp)
-target_link_libraries(qomemo lmdb)
+target_sources(squawk PRIVATE signal.h signal.cpp)
\ No newline at end of file
diff --git a/qomemo/signal.cpp b/qomemo/signal.cpp
new file mode 100644
index 0000000..0e5257b
--- /dev/null
+++ b/qomemo/signal.cpp
@@ -0,0 +1,5 @@
+/*
+ * Created by victoria on 2021-05-11.
+ */
+
+#include "signal.h"
diff --git a/qomemo/signal.h b/qomemo/signal.h
index e7e4c8b..4aa5701 100644
--- a/qomemo/signal.h
+++ b/qomemo/signal.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <signal_protocol.h>
+#include <signal/signal_protocol.h>
 
 namespace Signal
 {