diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk
index c96902f3..6dff9de4 100644
--- a/src/libgcrypt.mk
+++ b/src/libgcrypt.mk
@@ -28,10 +28,19 @@ define $(PKG)_MAKE
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     ln -sf '$(PREFIX)/$(TARGET)/bin/libgcrypt-config' '$(PREFIX)/bin/$(TARGET)-libgcrypt-config'
 
+    # create pkg-config file
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
+    (echo 'Name: $(PKG)'; \
+     echo 'Version: $($(PKG)_VERSION)'; \
+     echo 'Description: $(PKG)'; \
+     echo 'Libs: ' "`$(TARGET)-libgcrypt-config --libs`"; \
+     echo 'Cflags: ' "`$(TARGET)-libgcrypt-config --cflags`";) \
+     > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
+
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-libgcrypt.exe' \
-        `$(TARGET)-libgcrypt-config --cflags --libs`
+        `$(TARGET)-pkg-config libgcrypt --cflags --libs`
 endef
 
 define $(PKG)_BUILD
diff --git a/src/libomemo-test.cmake b/src/libomemo-test.cmake
index 425a07d6..7f5a880e 100644
--- a/src/libomemo-test.cmake
+++ b/src/libomemo-test.cmake
@@ -8,15 +8,9 @@ enable_language(C)
 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)
+pkg_check_modules(LIBOMEMO libomemo)
 
-include_directories(${GLIB2_INCLUDE_DIRS})
-target_link_libraries(${TGT} omemo-conversations
-                             ${MXML_LIBRARIES}
-                             gcrypt
-                             gpg-error
-                             pthread
-                             ${GLIB2_LIBRARIES})
+include_directories(${LIBOMEMO_INCLUDE_DIRS})
+target_link_libraries(${TGT} ${LIBOMEMO_LIBRARIES})
 
 install(TARGETS ${TGT} DESTINATION bin)
diff --git a/src/libomemo.mk b/src/libomemo.mk
index 1e451aa0..db1461e4 100644
--- a/src/libomemo.mk
+++ b/src/libomemo.mk
@@ -23,8 +23,16 @@ define $(PKG)_BUILD
         $(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//`)
+        `$(TARGET)-pkg-config --libs-only-l glib-2.0 sqlite3 mxml libgcrypt`)
+
+    # create pkg-config file
+    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
+    (echo 'Name: $(PKG)'; \
+     echo 'Version: $($(PKG)_VERSION)'; \
+     echo 'Description: $($(PKG)_DESCR)'; \
+     echo 'Requires: glib-2.0 sqlite3 mxml libgcrypt'; \
+     echo 'Libs: -lomemo-conversations';) \
+     > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc'
 
     # test cmake
     mkdir '$(SOURCE_DIR).test-cmake'