diff --git a/ChangeLog b/ChangeLog
index 523a7af24..0293bcc44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-dev, 2012-11-05
+v0.4.0-dev, 2012-11-06
 
 
 Version 0.4.0 (under dev!)
 --------------------------
 
+* core: stop cmake if gcrypt lib is not found (bug #37671)
 * core: add incomplete mouse events "event-down" and "event-drag" (task #11840)
 * core: add command /eval, use expression in conditions for bars
 * core: add option "-quit" for command /upgrade (save session and quit without
diff --git a/Makefile.am b/Makefile.am
index e22fc3859..570c4f302 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ EXTRA_DIST = CMakeLists.txt \
              cmake/cmake_uninstall.cmake.in \
              cmake/FindAsciidoc.cmake \
              cmake/FindAspell.cmake \
-             cmake/FindGcrypt.cmake \
+             cmake/FindGCRYPT.cmake \
              cmake/FindGettext.cmake \
              cmake/FindGnuTLS.cmake \
              cmake/FindIconv.cmake \
diff --git a/cmake/FindGcrypt.cmake b/cmake/FindGCRYPT.cmake
similarity index 81%
rename from cmake/FindGcrypt.cmake
rename to cmake/FindGCRYPT.cmake
index c6be857a6..bed4e4249 100644
--- a/cmake/FindGcrypt.cmake
+++ b/cmake/FindGCRYPT.cmake
@@ -41,10 +41,13 @@ IF(LIBGCRYPT_CONFIG_EXECUTABLE)
       SET(GCRYPT_CFLAGS " ")
    ENDIF(${GCRYPT_CFLAGS} MATCHES "\n")
 
-   IF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-      SET(GCRYPT_FOUND TRUE)
-   ENDIF(GCRYPT_LDFLAGS AND GCRYPT_CFLAGS)
-
 ENDIF(LIBGCRYPT_CONFIG_EXECUTABLE)
 
-MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT REQUIRED_VARS GCRYPT_LDFLAGS GCRYPT_CFLAGS)
+
+IF(GCRYPT_FOUND)
+  MARK_AS_ADVANCED(GCRYPT_CFLAGS GCRYPT_LDFLAGS)
+ENDIF(GCRYPT_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c4f316c6..518516d0e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -93,7 +93,7 @@ IF(ENABLE_NLS)
 ENDIF(ENABLE_NLS)
 
 # Check for libgcrypt
-FIND_PACKAGE(Gcrypt REQUIRED)
+FIND_PACKAGE(GCRYPT REQUIRED)
 ADD_DEFINITIONS(-DHAVE_GCRYPT)
 LIST(APPEND EXTRA_LIBS ${GCRYPT_LDFLAGS})