diff --git a/ChangeLog b/ChangeLog
index 6b3fd33cc..81b6b348a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ v0.4.1-dev, 2013-02-12
 Version 0.4.1 (under dev!)
 --------------------------
 
+* core: fix detection of iconv with cmake on OS X (bug #38321)
 * core: add signal "window_opened" (task #12464)
 * core: fix structures before buffer data when a buffer is closed
 * core: fix refresh of line after changes with hdata_update (update flag
diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
index c077ba0d8..66e2ec868 100644
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY
 IF(ICONV_INCLUDE_PATH)
   IF(ICONV_LIBRARY)
     STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
-    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    IF(NOT ICONV_FOUND)
-      CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
-    ENDIF(NOT ICONV_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
+    CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
+    IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
+       SET(ICONV_FOUND TRUE)
+    ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
   ELSE(ICONV_LIBRARY)
     CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
   ENDIF(ICONV_LIBRARY)