diff --git a/CMakeLists.txt b/CMakeLists.txt
index 624ccb313..c670cfde7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ set(QT_USE_QTMAIN TRUE)
 find_package(Qt4 REQUIRED)
 include(${QT_USE_FILE})
 
-find_package(Libgcrypt REQUIRED)
+find_package(Gcrypt REQUIRED)
 
 find_package(ZLIB REQUIRED)
 
diff --git a/cmake/FindGcrypt.cmake b/cmake/FindGcrypt.cmake
new file mode 100644
index 000000000..90303003c
--- /dev/null
+++ b/cmake/FindGcrypt.cmake
@@ -0,0 +1,23 @@
+#  Copyright (C) 2011 Felix Geyer <debfx@fobos.de>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 or (at your option)
+#  version 3 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+find_path(GCRYPT_INCLUDE_DIR gcrypt.h)
+
+find_library(GCRYPT_LIBRARIES gcrypt)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Gcrypt DEFAULT_MSG GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
+
+mark_as_advanced(GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
diff --git a/cmake/FindLibgcrypt.cmake b/cmake/FindLibgcrypt.cmake
deleted file mode 100644
index c12da3707..000000000
--- a/cmake/FindLibgcrypt.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# - Try to find the GNU Libgcrypt library
-# Once done this will define
-#
-#  LIBGCRYPT_FOUND - system has the Libgcrypt library
-#  LIBGCRYPT_LIBS - The libraries needed to use Libgcrypt
-
-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
-# Copyright (c) 2008, Modestas Vainius, <modestas@vainius.eu>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying LICENSE.BSD file.
-
-include(CheckIncludeFiles)
-
-check_include_files(gcrypt.h HAVE_GCRYPT_H)
-
-if (HAVE_GCRYPT_H)
-   set(LIBGCRYPT_HEADERS_FOUND TRUE)
-endif (HAVE_GCRYPT_H)
-
-if (LIBGCRYPT_HEADERS_FOUND)
-   find_library(LIBGCRYPT_LIBS NAMES gcrypt )
-endif (LIBGCRYPT_HEADERS_FOUND)
-
-if (LIBGCRYPT_LIBS)
-   set(LIBGCRYPT_FOUND TRUE)
-   message(STATUS "Libgcrypt found: ${LIBGCRYPT_LIBS}")
-elseif (Libgcrypt_FIND_REQUIRED)
-   message(FATAL_ERROR "Could not find Libgcrypt")
-endif (LIBGCRYPT_LIBS)