diff --git a/cmake/FindFFTW.cmake b/cmake/FindFFTW.cmake
index f294931d23..8071519791 100644
--- a/cmake/FindFFTW.cmake
+++ b/cmake/FindFFTW.cmake
@@ -9,7 +9,6 @@
 #   FFTW_INCLUDES            ... fftw include directory
 #
 # The following variables will be checked by the function
-#   FFTW_USE_STATIC_LIBS    ... if true, only static libraries are found
 #   FFTW_ROOT               ... if set, the libraries are exclusively searched
 #                               under this path
 #   FFTW_LIBRARY            ... fftw library to use
@@ -29,15 +28,6 @@ if( PKG_CONFIG_FOUND AND NOT FFTW_ROOT )
   pkg_check_modules( PKG_FFTW QUIET "fftw3" )
 endif()
 
-#Check whether to search static or dynamic libs
-set( CMAKE_FIND_LIBRARY_SUFFIXES_SAV ${CMAKE_FIND_LIBRARY_SUFFIXES} )
-
-if( ${FFTW_USE_STATIC_LIBS} )
-  set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX} )
-else()
-  set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX} )
-endif()
-
 if( FFTW_ROOT )
 
   #find libs
@@ -109,8 +99,6 @@ if(FFTWL_LIB)
   set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})
 endif()
 
-set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SAV} )
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(FFTW DEFAULT_MSG
                                   FFTW_INCLUDES FFTW_LIBRARIES)
diff --git a/cmake/FindHunspell.cmake b/cmake/FindHunspell.cmake
index 039d80b115..3d2425bcb3 100644
--- a/cmake/FindHunspell.cmake
+++ b/cmake/FindHunspell.cmake
@@ -26,7 +26,7 @@ FIND_PATH(HUNSPELL_INCLUDE_DIR NAMES hunspell.h
   PATH_SUFFIXES hunspell
 )
 
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell ${HUNSPELL_PKG_LIBRARIES}
+find_library(HUNSPELL_LIBRARIES NAMES hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell libhunspell ${HUNSPELL_PKG_LIBRARIES}
   PATHS
     /usr/local
     /usr