diff --git a/misc/amanda/patches/patch-config_ltconfig b/misc/amanda/patches/patch-config_ltconfig
index 4aee49e9270..5c4b15dbc24 100644
--- a/misc/amanda/patches/patch-config_ltconfig
+++ b/misc/amanda/patches/patch-config_ltconfig
@@ -1,17 +1,34 @@
-$OpenBSD: patch-config_ltconfig,v 1.1 2001/05/12 16:41:09 naddy Exp $
+$OpenBSD: patch-config_ltconfig,v 1.2 2002/01/05 21:29:25 naddy Exp $
 --- config/ltconfig.orig	Tue Jun 13 00:57:58 2000
-+++ config/ltconfig	Mon Apr 30 20:17:00 2001
-@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
++++ config/ltconfig	Sat Jan  5 22:23:38 2002
+@@ -501,7 +501,14 @@ fi
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++  case "$host_os" in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++  ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++  ;;
++  esac
+ fi
+ 
+ # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
+@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
    ;;
+-
 +openbsd*)
 +  with_gnu_ld=no
 +  ;;
- 
  esac
  
-@@ -1391,10 +1394,21 @@ else
+ ld_shlibs=yes
+@@ -1391,10 +1400,24 @@ else
      ;;
  
    openbsd*)
@@ -19,34 +36,51 @@ $OpenBSD: patch-config_ltconfig,v 1.1 2001/05/12 16:41:09 naddy Exp $
 -    hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
      hardcode_shlibpath_var=no
-+    case "$host_os" in
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++      hardcode_libdir_flag_spec='${wl}-R$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++    else
++      case "$host_os" in
 +      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
 +	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
 +	hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
++	;;
 +      *)
 +	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	 if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
-+	   export_dynamic_flag_spec='${wl}-E'
-+	 fi
-+      ;;
-+    esac
++	hardcode_libdir_flag_spec='${wl}-R$libdir'
++	;;
++      esac
++    fi
      ;;
  
    os2*)
-@@ -1955,13 +1969,10 @@ netbsd*)
+@@ -1955,9 +1978,25 @@ netbsd*)
  
  openbsd*)
    version_type=sunos
 -  if test "$with_gnu_ld" = yes; then
 -    need_lib_prefix=no
 -    need_version=no
--  fi
++  need_lib_prefix=no
++  need_version=no
++  sys_lib_search_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    case "$host_os" in
++    openbsd2.[89] | openbsd2.[89].*)
++      shlibpath_overrides_runpath=no
++    ;;
++    *)
++      shlibpath_overrides_runpath=yes
++    ;;
++    esac
++  else
++    deplibs_check_method='file_magic OpenBSD.* shared library'
++    shlibpath_overrides_runpath=yes
+   fi
    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method='pass_all'
-   ;;
- 
- os2*)
diff --git a/misc/amanda/patches/patch-config_ltmain_sh b/misc/amanda/patches/patch-config_ltmain_sh
index c8c966f085c..8839bb95124 100644
--- a/misc/amanda/patches/patch-config_ltmain_sh
+++ b/misc/amanda/patches/patch-config_ltmain_sh
@@ -1,47 +1,53 @@
-$OpenBSD: patch-config_ltmain_sh,v 1.1 2001/05/12 16:41:09 naddy Exp $
+$OpenBSD: patch-config_ltmain_sh,v 1.2 2002/01/05 21:29:25 naddy Exp $
 --- config/ltmain.sh.orig	Tue Jun 13 00:58:01 2000
-+++ config/ltmain.sh	Mon Apr 30 20:17:06 2001
-@@ -1073,7 +1073,18 @@ compiler."
++++ config/ltmain.sh	Sat Jan  5 22:23:42 2002
+@@ -1073,6 +1073,17 @@ compiler."
  	    # These systems don't actually have c library (as such)
  	    continue
  	    ;;
-+          *-*-openbsd*)
-+            # Do not include libc due to us having libc/libc_r.
-+            continue
-+            ;;
++	  *-*-openbsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    continue
++	    ;;
++	  esac
++	elif test "$arg" = "-lc_r"; then
++	  case "$host" in
++	  *-*-openbsd*)
++	    # Do not include libc_r directly, use -pthread flag.
++	    continue
++	    ;;
  	  esac
-+        elif test "$arg" = "-lc_r"; then
-+          case "$host" in
-+          *-*-openbsd*)
-+            # Do not include libc_r directly, use -pthread flag.
-+            continue
-+            ;;
-+          esac
  	elif test "$arg" = "-lm"; then
  	  case "$host" in
- 	  *-*-cygwin* | *-*-beos*)
-@@ -1085,6 +1096,10 @@ compiler."
+@@ -1085,6 +1096,17 @@ compiler."
  	deplibs="$deplibs $arg"
  	;;
  
-+      -?thread)
-+        deplibs="$deplibs $arg"
-+        ;;
++      -pthread)
++	case $host in
++	*-*-openbsd*)
++	  deplibs="$deplibs $arg"
++	  ;;
++	*)
++	  continue
++	  ;;
++	esac
++	;;
 +
        -module)
  	module=yes
  	continue
-@@ -1789,6 +1804,9 @@ compiler."
+@@ -1789,6 +1811,9 @@ compiler."
  	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
  	  # these systems don't actually have a c library (as such)!
  	  ;;
 +	*-*-openbsd*)
-+	  # do not include libc due to us having libc/libc_r.
++	  # Do not include libc due to us having libc/libc_r.
 +	  ;;
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
+@@ -3522,40 +3547,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0