diff --git a/CMakeLists.txt b/CMakeLists.txt
index 131a909a..46d62c62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ set (${project}_DEPS
 	# Tim Davis' SuiteSparse archive
 	"SuiteSparse COMPONENTS umfpack"
 	# solver
-	"SUPERLU"
+	"SuperLU"
 	# xml processing (for config parsing)
 	"TinyXML"
 	# Ensembles-based Reservoir Tools (ERT)
diff --git a/cmake/Modules/FindSUPERLU.cmake b/cmake/Modules/FindSuperLU.cmake
similarity index 100%
rename from cmake/Modules/FindSUPERLU.cmake
rename to cmake/Modules/FindSuperLU.cmake
diff --git a/cmake/Modules/Finddune-istl.cmake b/cmake/Modules/Finddune-istl.cmake
index d8d1a04c..14a40104 100644
--- a/cmake/Modules/Finddune-istl.cmake
+++ b/cmake/Modules/Finddune-istl.cmake
@@ -24,7 +24,7 @@ find_opm_package (
 
   # required dependencies
   "dune-common ${_require_dune_common};
-  SUPERLU
+  SuperLU
   "
   # header to search for
   "dune/istl/bcrsmatrix.hh"
diff --git a/cmake/Modules/Findopm-core.cmake b/cmake/Modules/Findopm-core.cmake
index 23a8e6bb..31c9f177 100644
--- a/cmake/Modules/Findopm-core.cmake
+++ b/cmake/Modules/Findopm-core.cmake
@@ -24,7 +24,7 @@ find_opm_package (
   BLAS REQUIRED;
   LAPACK REQUIRED;
   SuiteSparse COMPONENTS umfpack;
-  SUPERLU;
+  SuperLU;
   TinyXML;
   ERT;
   dune-istl
diff --git a/cmake/Modules/OpmFind.cmake b/cmake/Modules/OpmFind.cmake
index a5e77841..adaf60f7 100644
--- a/cmake/Modules/OpmFind.cmake
+++ b/cmake/Modules/OpmFind.cmake
@@ -81,23 +81,34 @@ macro (find_and_append_package_to prefix name)
 	message (STATUS "Finding package ${name} using module mode")
 	find_package (${name} ${ARGN})
   endif (${name}_DIR)
-  if (${name}_FOUND)
+  if (${name}_FOUND OR ${NAME}_FOUND)
 	foreach (var IN LISTS _opm_proj_vars)
 	  if (DEFINED ${name}_${var})
 		list (APPEND ${prefix}_${var} ${${name}_${var}})
-		# cleanup lists
-		if ("${var}" STREQUAL "LIBRARIES")
-		  remove_duplicate_libraries (${prefix})
-		else ("${var}" STREQUAL "LIBRARIES")
-		  list (REMOVE_DUPLICATES ${prefix}_${var})
-		endif ("${var}" STREQUAL "LIBRARIES")
+	  # some packages define an uppercase version of their own name
+	  elseif (DEFINED ${NAME}_${var})
+		list (APPEND ${prefix}_${var} ${${NAME}_${var}})
 	  endif (DEFINED ${name}_${var})
+	  # some packages define _PATH instead of _DIRS (Hi, MPI!)
+	  if ("${var}" STREQUAL "INCLUDE_DIRS")
+		if (DEFINED ${name}_INCLUDE_PATH)
+		  list (APPEND ${prefix}_INCLUDE_DIRS ${name}_INCLUDE_PATH)
+		elseif (DEFINED ${NAME}_INCLUDE_PATH)
+		  list (APPEND ${prefix}_INCLUDE_DIRS ${NAME}_INCLUDE_PATH)
+		endif (DEFINED ${name}_INCLUDE_PATH)
+	  endif ("${var}" STREQUAL "INCLUDE_DIRS")
+	  # cleanup lists
+	  if ("${var}" STREQUAL "LIBRARIES")
+		remove_duplicate_libraries (${prefix})
+	  else ("${var}" STREQUAL "LIBRARIES")
+		list (REMOVE_DUPLICATES ${prefix}_${var})
+	  endif ("${var}" STREQUAL "LIBRARIES")
 	endforeach (var)
 	# some libraries only define xxx_FOUND and not a corresponding HAVE_xxx
 	if (NOT DEFINED HAVE_${NAME})
 	  set (HAVE_${NAME} 1)
 	endif (NOT DEFINED HAVE_${NAME})
-  endif (${name}_FOUND)
+  endif (${name}_FOUND OR ${NAME}_FOUND)
 endmacro (find_and_append_package_to prefix name)
 
 # append to the list of variables associated with the project
diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake
index 07efd102..79ab4634 100644
--- a/cmake/Modules/OpmPackage.cmake
+++ b/cmake/Modules/OpmPackage.cmake
@@ -219,6 +219,11 @@ function (find_opm_package module deps header lib defs prog conf)
   set (${module}_LINKER_FLAGS "${${module}_LINKER_FLAGS}" PARENT_SCOPE)
   set (${module}_QUIET "${${module}_QUIET}" PARENT_SCOPE)
   set (HAVE_${MODULE} "${HAVE_${MODULE}}" PARENT_SCOPE)
+
+  # print everything out if we're asked to
+  if (${module}_DEBUG)
+	debug_find_vars (${module})
+  endif (${module}_DEBUG)
 endfunction (find_opm_package module deps header lib defs prog conf)
 
 # print all variables defined by the above macro