3 files changed, 10 insertions, 2 deletions
diff --git a/binreloc.c b/binreloc.c
index 1d1acfe6..a44bd08a 100644
--- a/binreloc.c
+++ b/binreloc.c
@@ -594,7 +594,7 @@ gchar *gbr_find_lib_dir(const gchar * default_lib_dir)
     }
 
 #ifdef ARCH_x86_64
-    dir = g_build_filename(prefix, "lib64", NULL);
+    dir = g_build_filename(prefix, "lib", NULL);
 #else
     dir = g_build_filename(prefix, "lib", NULL);
 #endif
diff --git a/configure b/configure
index b5903adf..4a3d6ce1 100755
--- a/configure
+++ b/configure
@@ -56,7 +56,7 @@ case $PROC in
 	x86_64)
 		ln -sf linux/x86_64 arch/this
 		ARCH="ARCH_x86_64"
-		LIBDIR="/usr/lib64" ;;
+		LIBDIR="/usr/lib" ;;
 	mips*)
 		ln -sf linux/mips arch/this
 		ARCH="ARCH_MIPS" ;;
diff --git a/debian/changelog b/debian/changelog
index e8655119..f3d7fada 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hardinfo (0.5.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * [cd677eda] Move files from /usr/lib64 to /usr/lib. (Closes: #557569)
+    - thanks to Kurt Roeckx
+
+ -- Bernd Zeimetz <bzed@debian.org>  Fri, 22 Jan 2010 21:22:24 +0100
+
 hardinfo (0.5.1-1) unstable; urgency=low
 
   * New upstream version. (Closes: #530290, #517591)