diff --git a/src/libomemo-test.c b/src/libomemo-test.c
index ef1cbc7c..4532baca 100644
--- a/src/libomemo-test.c
+++ b/src/libomemo-test.c
@@ -23,11 +23,11 @@ int main(int argc, char *argv[])
     uint32_t sid = 9178;
 
     omemo_message * msg_out_p;
-    if (omemo_message_prepare_encryption(msg_p, sid, &crypto, &msg_out_p) != 0)
+    if (omemo_message_prepare_encryption(msg_p, sid, &crypto, OMEMO_STRIP_NONE, &msg_out_p) != 0)
         return 1;
 
     char * xml_out_p;
-    if (omemo_message_export_encrypted(msg_out_p, &xml_out_p) != 0)
+    if (omemo_message_export_encrypted(msg_out_p, OMEMO_ADD_MSG_NONE, &xml_out_p) != 0)
         return 1;
 
     printf("Encrypted message:\n%s\n\n", xml_out_p);
diff --git a/src/libomemo-test.cmake b/src/libomemo-test.cmake
index 44e7fc54..425a07d6 100644
--- a/src/libomemo-test.cmake
+++ b/src/libomemo-test.cmake
@@ -9,14 +9,14 @@ add_executable(${TGT} ${CMAKE_CURRENT_LIST_DIR}/${PKG}-test.c)
 
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GLIB2 glib-2.0)
+pkg_check_modules(MXML mxml)
 
 include_directories(${GLIB2_INCLUDE_DIRS})
 target_link_libraries(${TGT} omemo-conversations
-                             mxml
+                             ${MXML_LIBRARIES}
                              gcrypt
                              gpg-error
                              pthread
                              ${GLIB2_LIBRARIES})
 
 install(TARGETS ${TGT} DESTINATION bin)
-
diff --git a/src/libomemo.mk b/src/libomemo.mk
index e5b67050..1e451aa0 100644
--- a/src/libomemo.mk
+++ b/src/libomemo.mk
@@ -4,8 +4,8 @@ PKG             := libomemo
 $(PKG)_WEBSITE  := https://github.com/gkdr/libomemo
 $(PKG)_DESCR    := Implementation of OMEMO in C
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.4.1
-$(PKG)_CHECKSUM := af66fd2958dc5d6b23bc488b69e9f431bfb308d79bdd1b1c31de4575862c5142
+$(PKG)_VERSION  := 0.6.1
+$(PKG)_CHECKSUM := 26e2ef3df93d9461ed6d62bbb495b8ac6de385ec7a5aa28ff28dd869ba908170
 $(PKG)_GH_CONF  := gkdr/libomemo, v
 $(PKG)_DEPS     := gcc glib libgcrypt mxml sqlite
 
@@ -18,8 +18,13 @@ define $(PKG)_BUILD
         LIBGCRYPT_CONFIG='$(PREFIX)/$(TARGET)/bin/libgcrypt-config'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
-    $(INSTALL) -m644 '$(SOURCE_DIR)/build'/libomemo*.a  '$(PREFIX)/$(TARGET)/lib/'
     $(INSTALL) -m644 '$(SOURCE_DIR)/src'/libomemo*.h  '$(PREFIX)/$(TARGET)/include/'
+    $(if $(BUILD_STATIC),\
+        $(INSTALL) -m644 '$(SOURCE_DIR)/build'/libomemo*.a  '$(PREFIX)/$(TARGET)/lib/' \
+    $(else), \
+        $(MAKE_SHARED_FROM_STATIC) '$(SOURCE_DIR)/build/libomemo-conversations.a' \
+        `$(TARGET)-pkg-config --libs-only-l glib-2.0 sqlite3 mxml` \
+        `$(TARGET)-libgcrypt-config --libs | sed s/-L.*\b//`)
 
     # test cmake
     mkdir '$(SOURCE_DIR).test-cmake'
@@ -28,5 +33,3 @@ define $(PKG)_BUILD
         '$(PWD)/src/cmake/test'
     $(MAKE) -C '$(SOURCE_DIR).test-cmake' -j 1 install
 endef
-
-$(PKG)_BUILD_SHARED =