diff --git a/.travis.yml b/.travis.yml
index 533ea98c..b843d933 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ install:
     - lsb_release -a
     - uname -a
     - sudo apt-get update
-    - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libsignal-protocol-c-dev
+    - sudo apt-get -y install libssl-dev libexpat1-dev libncursesw5-dev libglib2.0-dev libnotify-dev libcurl3-dev libxss-dev libotr5-dev libgpgme11-dev autoconf-archive expect-dev tcl-dev libtool python-dev libgtk2.0-dev libgcrypt20-dev libcmocka-dev
     - git clone git://github.com/boothj5/libmesode.git
     - cd libmesode
     - mkdir m4
@@ -15,16 +15,6 @@ install:
     - sudo make install
     - cd ..
     - rm -rf libmesode
-    - wget https://cmocka.org/files/1.0/cmocka-1.0.0.tar.xz
-    - tar -xvf cmocka-1.0.0.tar.xz
-    - cd cmocka-1.0.0
-    - mkdir build
-    - cd build
-    - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..
-    - make
-    - sudo make install
-    - cd ../..
-    - rm -rf cmocka-1.0.0
     - sudo apt-get install libmicrohttpd-dev
     - git clone git://github.com/boothj5/stabber.git
     - cd stabber
@@ -34,4 +24,15 @@ install:
     - sudo make install
     - cd ..
     - rm -rf stabber
+    - git clone https://github.com/signalapp/libsignal-protocol-c.git
+    - cd libsignal-protocol-c
+    - git checkout v2.3.2
+    - mkdir build
+    - cd build
+    - cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../
+    - make
+    - sudo make install
+    - cd ../../
+    - rm -rf libsignal-protocol-c
+    - cat /usr/include/gcrypt.h
 script: ./travis-build.sh
diff --git a/configure.ac b/configure.ac
index 06daa8d9..4f6a6790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,12 +280,12 @@ if test "x$enable_omemo" != xno; then
                    [AC_MSG_ERROR([libsignal-protocol-c is required for OMEMO support])],
                    [AC_MSG_NOTICE([libsignal-protocol-c not found, OMEMO support not enabled])])])])
 
-    AC_CHECK_LIB([gcrypt], [gcry_check_version],
+    AC_CHECK_LIB([gcrypt], [gcry_md_extract],
         [LIBS="-lgcrypt $LIBS"],
         [AM_CONDITIONAL([BUILD_OMEMO], [false])
          AS_IF([test "x$enable_omemo" = xyes],
-               [AC_MSG_ERROR([gcrypt is required for OMEMO support])],
-               [AC_MSG_NOTICE([gcrypt not found, OMEMO support not enabled])])])
+               [AC_MSG_ERROR([gcrypt >= 1.7.0 is required for OMEMO support])],
+               [AC_MSG_NOTICE([gcrypt >= 1.7.0 not found, OMEMO support not enabled])])])
 
    AM_COND_IF([BUILD_OMEMO], [AC_DEFINE([HAVE_OMEMO], [1], [Have OMEMO])])
 fi