--- configure
+++ configure	2009-08-28 15:44:29.774401466 +0000
@@ -19120,6 +19120,10 @@ rm -f core conftest.err conftest.$ac_obj
   # most powerpc-linux boxes support dynamic linking these days and
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
+  if test -n "$ARCH_LIB" ; then
+      sys_lib_search_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+      sys_lib_dlsearch_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+  fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
--- m4/libtool.m4
+++ m4/libtool.m4	2009-08-28 15:46:57.481902434 +0000
@@ -2622,6 +2622,10 @@ linux* | k*bsd*-gnu)
   # most powerpc-linux boxes support dynamic linking these days and
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
+  if test -n "$ARCH_LIB" ; then
+      sys_lib_search_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+      sys_lib_dlsearch_path_spec="/usr/${ARCH_LIB} /${ARCH_LIB}"
+  fi
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
--- texk/web2c/luatexdir/font/mapfile.w
+++ texk/web2c/luatexdir/font/mapfile.w	2013-06-28 09:55:26.505439260 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
     "$Id: mapfile.w 4442 2012-05-25 22:40:34Z hhenkel $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/font/mapfile.w $";
 
-#include <math.h>
 #include "ptexlib.h"
+#include <math.h>
 #include <kpathsea/c-auto.h>
 #include <kpathsea/c-memstr.h>
 #include <string.h>
--- texk/web2c/luatexdir/font/sfnt.w
+++ texk/web2c/luatexdir/font/sfnt.w	2013-06-28 09:57:18.877439867 +0000
@@ -28,10 +28,9 @@ static const char _svn_version[] =
 #if  HAVE_CONFIG_H
 #  include <w2c/config.h>
 #endif                          /* |HAVE_CONFIG_H_| */
+#include "ptexlib.h"
 
 #include <string.h>
-
-#  include "ptexlib.h"
 #include "font/sfnt.h"
 
 @ type:
--- texk/web2c/luatexdir/font/tt_table.w
+++ texk/web2c/luatexdir/font/tt_table.w	2013-06-28 09:57:42.537938970 +0000
@@ -24,8 +24,8 @@ static const char _svn_version[] =
     "$Id: tt_table.w 4442 2012-05-25 22:40:34Z hhenkel $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/font/tt_table.w $";
 
-#include <stdio.h>
 #include "ptexlib.h"
+#include <stdio.h>
 #include "font/sfnt.h"
 #include "font/tt_table.h"
 
--- texk/web2c/luatexdir/image/writejbig2.w
+++ texk/web2c/luatexdir/image/writejbig2.w	2013-06-28 09:58:16.518102785 +0000
@@ -89,10 +89,10 @@ static const char _svn_version[] =
 #ifdef HAVE_CONFIG_H
 #include <w2c/config.h>
 #endif
+#include "ptexlib.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
-#include "ptexlib.h"
 #include "image/image.h"
 
 @ @c
--- texk/web2c/luatexdir/image/writejp2.w
+++ texk/web2c/luatexdir/image/writejp2.w	2013-06-28 09:58:29.725989863 +0000
@@ -28,9 +28,9 @@ Information technology --- JPEG~2000 ima
 ISO/IEC 15444-1, Second edition, 2004-09-15, file |15444-1annexi.pdf|.
 
 @c
+#include "ptexlib.h"
 #include <math.h>
 #include <assert.h>
-#include "ptexlib.h"
 #include "image/image.h"
 #include "image/writejp2.h"
 #include "image/writejbig2.h"   /* read2bytes(), read4bytes() */
--- texk/web2c/luatexdir/image/writejpg.w
+++ texk/web2c/luatexdir/image/writejpg.w	2013-06-28 12:46:45.321439150 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
     "$Id: writejpg.w 4442 2012-05-25 22:40:34Z hhenkel $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writejpg.w $";
 
-#include <assert.h>
 #include "ptexlib.h"
+#include <assert.h>
 #include "image/image.h"
 #include "image/writejpg.h"
 
--- texk/web2c/luatexdir/image/writepng.w
+++ texk/web2c/luatexdir/image/writepng.w	2013-06-28 09:58:59.837438998 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
     "$Id: writepng.w 4442 2012-05-25 22:40:34Z hhenkel $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writepng.w $";
 
-#include <assert.h>
 #include "ptexlib.h"
+#include <assert.h>
 #include "image/image.h"
 #include "image/writepng.h"
 
--- texk/web2c/luatexdir/tex/texfileio.w
+++ texk/web2c/luatexdir/tex/texfileio.w	2013-06-28 10:00:24.621439403 +0000
@@ -22,8 +22,8 @@ static const char _svn_version[] =
     "$Id: texfileio.w 4521 2012-12-14 13:54:54Z taco $"
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/tex/texfileio.w $";
 
-#include <string.h>
 #include "ptexlib.h"
+#include <string.h>
 #include <kpathsea/absolute.h>
 
 @ @c
--- texk/web2c/luatexdir/utils/unistring.w
+++ texk/web2c/luatexdir/utils/unistring.w	2013-06-28 10:00:55.485439104 +0000
@@ -23,8 +23,8 @@ static const char _svn_version[] =
     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/utils/unistring.w $";
 
 @ @c
-#include <string.h>
 #include "ptexlib.h"
+#include <string.h>
 
 @ @c
 static void utf_error(void)