diff --git a/cmake/Modules/OpmInstall.cmake b/cmake/Modules/OpmInstall.cmake
index 1c713717..59435249 100644
--- a/cmake/Modules/OpmInstall.cmake
+++ b/cmake/Modules/OpmInstall.cmake
@@ -50,6 +50,6 @@ macro (opm_install opm)
   endif (${opm}_LIBRARY_TYPE STREQUAL "SHARED" AND ${opm}_TARGET AND ${opm}_DEBUG)
   install (
 	FILES ${PROJECT_SOURCE_DIR}/dune.module
-	DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}${${opm}_VER_DIR}/dunecontrol/${${opm}_NAME}
+	DESTINATION lib${${opm}_VER_DIR}/dunecontrol/${${opm}_NAME}
 	)
 endmacro (opm_install opm)
diff --git a/cmake/Modules/UseMultiArch.cmake b/cmake/Modules/UseMultiArch.cmake
index 06a40126..f1a5d665 100644
--- a/cmake/Modules/UseMultiArch.cmake
+++ b/cmake/Modules/UseMultiArch.cmake
@@ -5,10 +5,6 @@
 #	                             depending on the platform; use this path
 #	                             for platform-specific binaries.
 #
-#	CMAKE_INSTALL_LIBDIR_NOARCH  to lib or lib64 depending on the platform;
-#	                             use this path for architecture-independent
-#	                             files.
-#
 # Note that it will override the results of GNUInstallDirs if included after
 # that module.
 
@@ -22,21 +18,15 @@ if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
   else (EXISTS "/etc/debian_version")
 	# 64-bit system?
 	if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-	  set (_libdir_noarch "lib64")
+	  set (_libdir_def "lib64")
 	else (CMAKE_SIZEOF_VOID_P EQUAL 8)
-	  set (_libdir_noarch "lib")
+	  set (_libdir_def "lib")
 	endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
-	set (_libdir_def "${_libdir_noarch}")
   endif (EXISTS "/etc/debian_version")
 else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
   set (_libdir_def "lib")
-  set (_libdir_noarch "lib")
 endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
 
 # let the user override if somewhere else is desirable
 set (CMAKE_INSTALL_LIBDIR "${_libdir_def}" CACHE PATH "Object code libraries")
-set (CMAKE_INSTALL_LIBDIR_NOARCH "${_libdir_noarch}" CACHE PATH "Architecture-independent library files")
-mark_as_advanced (
-  CMAKE_INSTALL_LIBDIR
-  CMAKE_INSTALL_LIBDIR_NOARCH
-  )
+mark_as_advanced (CMAKE_INSTALL_LIBDIR)