diff --git a/debian/changelog b/debian/changelog
index b6932f713..344bde48c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 cmake (2.8.4+dfsg.1-5) UNRELEASED; urgency=low
 
+  * Fix multiarch regex to support armel and (hopefully) all other possible
+    linux architectures (patch multiarch_basic_support.diff updated).
 
  -- Modestas Vainius <modax@debian.org>  Sat, 11 Jun 2011 22:15:57 +0300
 
diff --git a/debian/patches/multiarch_basic_support.diff b/debian/patches/multiarch_basic_support.diff
index 29b44561e..0fbc5bbd4 100644
--- a/debian/patches/multiarch_basic_support.diff
+++ b/debian/patches/multiarch_basic_support.diff
@@ -109,7 +109,7 @@ search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
  ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
  
 +# Match multiarch library directory names.
-+SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+-linux-gnu")
++SET(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
 +
  INCLUDE(Platform/UnixPaths)