diff --git a/Makefile.am b/Makefile.am
index 3eb99bd80a..0516d1a512 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,10 @@ if ISLINUX
 AM_LDFLAGS += -Wl,-E
 endif
 
+if IS64BITLINUX
+AM_CFLAGS += -m64 -march=k8
+endif
+
 if ISMAC
 SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
 AM_CFLAGS += -DMACOSX -DSWAP_LINEAR
diff --git a/Makefile.in b/Makefile.in
index 5e4a3e62e9..a7fb6e0ce3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,7 +39,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @ISLINUX_TRUE@am__append_1 = -Wl,-E
-@ISMAC_TRUE@am__append_2 = -DMACOSX -DSWAP_LINEAR
+@IS64BITLINUX_TRUE@am__append_2 = -m64 -march=k8
+@ISMAC_TRUE@am__append_3 = -DMACOSX -DSWAP_LINEAR
 bin_PROGRAMS = freeswitch$(EXEEXT)
 DIST_COMMON = README $(am__configure_deps) $(library_include_HEADERS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -156,6 +157,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IS64BITLINUX_FALSE = @IS64BITLINUX_FALSE@
+IS64BITLINUX_TRUE = @IS64BITLINUX_TRUE@
 ISLINUX_FALSE = @ISLINUX_FALSE@
 ISLINUX_TRUE = @ISLINUX_TRUE@
 ISMAC_FALSE = @ISMAC_FALSE@
@@ -233,9 +236,9 @@ APR_CONFIG = $(prefix)/bin/apr-1-config
 APU_CONFIG = $(prefix)/bin/apu-1-config
 AM_CFLAGS = -I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags \
 	--cppflags --includes) $(shell $(APU_CONFIG) --includes) \
-	$(am__append_2) -fPIC -Wall -I$(PWD)/src/sqlite -I$(PWD) \
-	-I$(PWD)/src/include -I$(PREFIX)/include \
-	-DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
+	$(am__append_2) $(am__append_3) -fPIC -Wall \
+	-I$(PWD)/src/sqlite -I$(PWD) -I$(PWD)/src/include \
+	-I$(PREFIX)/include -DSWITCH_MOD_DIR=\"$(PREFIX)/mod\" \
 	-DSWITCH_PREFIX_DIR=\"$(PREFIX)\" \
 	-DSWITCH_CONF_DIR=\"$(PREFIX)/conf\" \
 	-DSWITCH_DB_DIR=\"$(PREFIX)/db\"
diff --git a/buildlib.sh b/buildlib.sh
index f8f8d82534..e1ad1fe539 100755
--- a/buildlib.sh
+++ b/buildlib.sh
@@ -64,7 +64,10 @@ fi
 
 if [ ! -z $install ] ; then
     gmake install
-    ldconfig 2>&1
+    ldpath=`which ldconfig`
+    if [ ! -z $ldpath ] ; then
+	ldconfig 2>&1
+    fi
 fi
 
 if [ $? == 0 ] ; then
diff --git a/configure b/configure
index 4506e05de0..94ee20f9ff 100755
--- a/configure
+++ b/configure
@@ -466,7 +466,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -21390,6 +21390,16 @@ fi
 
 
 
+if test `uname -m` = x86_64; then
+  IS64BITLINUX_TRUE=
+  IS64BITLINUX_FALSE='#'
+else
+  IS64BITLINUX_TRUE='#'
+  IS64BITLINUX_FALSE=
+fi
+
+
+
 
           ac_config_files="$ac_config_files src/include/switch_version.h"
 cat >confcache <<\_ACEOF
@@ -21518,6 +21528,13 @@ echo "$as_me: error: conditional \"ISMAC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${IS64BITLINUX_TRUE}" && test -z "${IS64BITLINUX_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"IS64BITLINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"IS64BITLINUX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -22121,6 +22138,8 @@ s,@ISLINUX_TRUE@,$ISLINUX_TRUE,;t t
 s,@ISLINUX_FALSE@,$ISLINUX_FALSE,;t t
 s,@ISMAC_TRUE@,$ISMAC_TRUE,;t t
 s,@ISMAC_FALSE@,$ISMAC_FALSE,;t t
+s,@IS64BITLINUX_TRUE@,$IS64BITLINUX_TRUE,;t t
+s,@IS64BITLINUX_FALSE@,$IS64BITLINUX_FALSE,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
diff --git a/configure.in b/configure.in
index c9332d6d96..8a92d4727c 100644
--- a/configure.in
+++ b/configure.in
@@ -41,6 +41,7 @@ AC_CONFIG_FILES([Makefile])
 
 AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])
 AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
+AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64])