diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml
index 326bdb5f99..00815b36d1 100644
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -20,7 +20,7 @@ packages:
   - libassuan
   - libgpg-error
   - libgcrypt
-  - libsignal-protocol-c
+  - libomemo-c
   - sqlite3
 
 sources:
diff --git a/Brewfile b/Brewfile
index d73a973c6f..c5d0b58d63 100644
--- a/Brewfile
+++ b/Brewfile
@@ -11,7 +11,7 @@ brew 'gpgme'
 brew 'gtk+'
 brew 'libffi'
 brew 'libotr'
-brew 'libsignal-protocol-c'
+brew 'libomemo-c'
 brew 'libstrophe'
 brew 'libtool'
 brew 'ncurses'
diff --git a/Dockerfile.arch b/Dockerfile.arch
index d8d981e5ce..6e24d5e8a9 100644
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -1,6 +1,6 @@
 FROM archlinux
 
-RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
+RUN pacman -Syu --noconfirm && pacman -Sy --needed --noconfirm \
   autoconf \
   autoconf-archive \
   automake \
@@ -19,7 +19,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
   libgcrypt \
   libmicrohttpd \
   libnotify \
-  libsignal-protocol-c \
+  libomemo-c \
   libotr \
   libtool \
   libxss \
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 114aec28a0..bf98b6a24e 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libnotify-dev \
   libotr5-dev \
   libreadline-dev \
-  libsignal-protocol-c-dev \
+  libomemo-c-dev \
   libssl-dev \
   libtool \
   libxss-dev \
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index c8004c1160..d9eca48f13 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -24,7 +24,7 @@ RUN dnf install -y \
   libmicrohttpd-devel \
   libnotify-devel \
   libotr-devel \
-  libsignal-protocol-c-devel \
+  libomemo-c-devel \
   libtool \
   libuuid-devel \
   make \
diff --git a/Dockerfile.tumbleweed b/Dockerfile.tumbleweed
index 1777d1708d..cc292d6b57 100644
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -24,7 +24,7 @@ RUN zypper --non-interactive in --no-recommends \
   libmicrohttpd-devel \
   libnotify-devel \
   libotr-devel \
-  libsignal-protocol-c-devel \
+  libomemo-c-devel \
   libtool \
   libuuid-devel \
   make \
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 7f100dddba..a3aca879ef 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libnotify-dev \
   libotr5-dev \
   libreadline-dev \
-  libsignal-protocol-c-dev \
+  libomemo-c-dev \
   libssl-dev \
   libtool \
   libxss-dev \
diff --git a/configure.ac b/configure.ac
index f9346fdfe0..64f8d7d18b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,13 +331,13 @@ dnl feature: omemo
 AM_CONDITIONAL([BUILD_OMEMO], [false])
 if test "x$enable_omemo" != xno; then
     OMEMO_LIBS=""
-    PKG_CHECK_MODULES([libsignal], [libsignal-protocol-c >= 2.3.2],
-        [OMEMO_LIBS="-lsignal-protocol-c"
+    PKG_CHECK_MODULES([libomemo], [libomemo-c],
+        [OMEMO_LIBS="-lomemo-c"
          AC_CHECK_LIB([gcrypt], [gcry_md_extract],
              [OMEMO_LIBS="-lgcrypt $OMEMO_LIBS"
               AM_CONDITIONAL([BUILD_OMEMO], [true])],
              [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])],
-        [AC_MSG_NOTICE([libsignal-protocol-c >= 2.3.2 not found, OMEMO support not enabled])])
+        [AC_MSG_NOTICE([libomemo-c not found, OMEMO support not enabled])])
 
     AM_COND_IF([BUILD_OMEMO],
         [AC_DEFINE([HAVE_OMEMO], [1], [Have OMEMO])
diff --git a/src/omemo/crypto.c b/src/omemo/crypto.c
index 8653b1d19d..0cc933760e 100644
--- a/src/omemo/crypto.c
+++ b/src/omemo/crypto.c
@@ -35,8 +35,8 @@
 #include "config.h"
 
 #include <assert.h>
-#include <signal/signal_protocol.h>
-#include <signal/signal_protocol_types.h>
+#include <omemo/signal_protocol.h>
+#include <omemo/signal_protocol_types.h>
 
 #include "log.h"
 #include "omemo/omemo.h"
diff --git a/src/omemo/crypto.h b/src/omemo/crypto.h
index d3f775dd80..bf5d034232 100644
--- a/src/omemo/crypto.h
+++ b/src/omemo/crypto.h
@@ -34,7 +34,7 @@
  */
 #include <stdio.h>
 #include <stdbool.h>
-#include <signal/signal_protocol_types.h>
+#include <omemo/signal_protocol_types.h>
 #include <gcrypt.h>
 
 #define AES128_GCM_KEY_LENGTH 16
diff --git a/src/omemo/omemo.c b/src/omemo/omemo.c
index f47ff5064d..1356d9d158 100644
--- a/src/omemo/omemo.c
+++ b/src/omemo/omemo.c
@@ -42,11 +42,11 @@
 #include <errno.h>
 #include <glib.h>
 #include <pthread.h>
-#include <signal/key_helper.h>
-#include <signal/protocol.h>
-#include <signal/signal_protocol.h>
-#include <signal/session_builder.h>
-#include <signal/session_cipher.h>
+#include <omemo/key_helper.h>
+#include <omemo/protocol.h>
+#include <omemo/signal_protocol.h>
+#include <omemo/session_builder.h>
+#include <omemo/session_cipher.h>
 
 #include "config/account.h"
 #include "config/files.h"
diff --git a/src/omemo/store.c b/src/omemo/store.c
index fd085a582f..a3fda04269 100644
--- a/src/omemo/store.c
+++ b/src/omemo/store.c
@@ -33,7 +33,7 @@
  *
  */
 #include <glib.h>
-#include <signal/signal_protocol.h>
+#include <omemo/signal_protocol.h>
 
 #include "config.h"
 #include "log.h"
diff --git a/src/omemo/store.h b/src/omemo/store.h
index b6a9a74d7b..34e632528d 100644
--- a/src/omemo/store.h
+++ b/src/omemo/store.h
@@ -32,7 +32,7 @@
  * source files in the program, then also delete it here.
  *
  */
-#include <signal/signal_protocol.h>
+#include <omemo/signal_protocol.h>
 
 #include "config.h"