diff --git a/configure b/configure
index 90167f8..bacd36d 100755
--- a/configure
+++ b/configure
@@ -460,7 +460,7 @@ FreeBSD)
   audio_possible_drivers="oss sdl esd pa"
   # -lutil needed for kinfo_getvmmap(3) in libutil.h
   # -lprocstat needed for procstat_*(3) in bsd-user/main.c
-  LIBS="-lprocstat -lutil $LIBS"
+  LIBS="-lprocstat -lintl -lutil $LIBS"
   HOST_ABI_DIR="freebsd"
 ;;
 DragonFly)
@@ -4089,9 +4089,9 @@ if test "$gcov" = "yes" ; then
   echo "GCOV=$gcov_tool" >> $config_host_mak
 fi
 
-# generate list of library paths for linker script
-$ld --verbose -v 2> /dev/null | grep SEARCH_DIR > config-host.ld
-
+## generate list of library paths for linker script
+#$ld --verbose -v 2> /dev/null | grep SEARCH_DIR > config-host.ld
+#
 # use included Linux headers
 if test "$linux" = "yes" ; then
   mkdir -p linux-headers
@@ -4458,21 +4458,42 @@ if test "$gprof" = "yes" ; then
   fi
 fi
 
-if test "$ARCH" = "tci"; then
-  linker_script=""
-else
-  linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/ldscripts/\$(ARCH).ld"
-fi
+#if test "$ARCH" = "tci"; then
+#  linker_script=""
+#else
+#  linker_script="-Wl,-T../config-host.ld -Wl,-T,\$(SRC_PATH)/ldscripts/\$(ARCH).ld"
+#fi
 
 if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then
+  textseg_addr=
   case "$ARCH" in
-  alpha | s390x | aarch64)
-    # The default placement of the application is fine.
+    arm | hppa | i386 | ia64 | m68k | ppc | ppc64 | s390 | sparc | sparc64 | x86_64)
+    default_textseg_addr=0x400000
+    textseg_addr=0x60000000
     ;;
-  *)
-    ldflags="$linker_script $ldflags"
+    mips)
+      default_textseg_addr=0x120000000
+      textseg_addr=0x400000
     ;;
   esac
+  if [ -n "$textseg_addr" ]; then
+cat > $TMPC <<EOF
+int main(void) { return 0; }
+EOF
+     try_ldflags="-Ttext-segment=$textseg_addr"
+     if compile_prog "" "$try_ldflags"; then
+       ldflags="$ldflags $try_ldflags"
+     else
+       # In case ld does not support -Ttext-segment, edit the default linker
+       # script via sed to set the .text start addr.  This is needed on FreeBSD
+       # at least.
+       $ld --verbose | sed \
+         -e '1,/==================================================/d' \
+         -e '/==================================================/,$d' \
+         -e "s/$default_textseg_addr/$textseg_addr/g" > config-host.ld
+      ldflags="$ldflags -Wl,-T../config-host.ld"
+      fi
+   fi
 fi
 
 echo "LDFLAGS+=$ldflags" >> $config_target_mak
diff --git a/util/aes.c b/util/aes.c
index 91e97fa..207de01 100644
--- a/util/aes.c
+++ b/util/aes.c
@@ -877,6 +877,7 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 	return 0;
 }
 
+#if 0
 #ifndef AES_ASM
 /*
  * Encrypt a single block
@@ -1312,3 +1313,4 @@ void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
 		}
 	}
 }
+#endif