--- a/Makefile.in	Thu Aug 08 12:10:55 2013 -0400
+++ b/Makefile.in	Thu Aug 08 12:19:35 2013 -0400
@@ -47,6 +47,9 @@
 # Use openblas for octave
 ENABLE_OPENBLAS := @ENABLE_OPENBLAS@
 
+# Look in lib64 directory.
+MXE_USE_LIB64_DIRECTORY := @ENABLE_LIB64_DIRECTORY@
+
 ## end of configuration variables.
 
 ifneq ($(MXE_NATIVE_BUILD),yes)
@@ -163,7 +166,11 @@
 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
 
 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
-CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
+ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+  CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
+else
+  CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
+endif
 CONFIGURE_POST_HOOK := true
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
@@ -251,10 +258,15 @@
     NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
   endif
 else ifneq ($(MXE_SYSTEM),msvc)
-  LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
+  MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
+  ifeq ($MXE_USE_LIB64_DIRECTORY)
+    MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
+    LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
+  else
+    MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
+    LD_LIBRARY_PATH := $(HOST_LIBDIR)
+  endif
   export LD_LIBRARY_PATH
-  MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
-  MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
 endif
 
 LN := ln