diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index 79e3b210347..36a5e52819d 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,6 +1,44 @@
 --- ltconfig.orig	Sat May 27 07:15:00 2000
-+++ ltconfig	Thu Jun 22 00:17:19 2000
-@@ -2028,6 +2028,7 @@
++++ ltconfig	Sat Oct 21 13:46:37 2000
+@@ -1105,6 +1105,9 @@
+     with_gnu_ld=no
+   fi
+   ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ 
+ esac
+ 
+@@ -1402,10 +1405,18 @@
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    case "$host_os" in
++      openbsd2.[01234567])
++	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'
++      ;;
++    esac
+     ;;
+ 
+   os2*)
+@@ -2021,13 +2032,10 @@
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+-  fi
    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
index aaf5101d5fe..ca3277b0241 100644
--- a/devel/libtool/patches/patch-ad
+++ b/devel/libtool/patches/patch-ad
@@ -1,6 +1,16 @@
---- ltmain.sh.orig	Sun Jun 11 22:52:14 2000
-+++ ltmain.sh	Sun Jun 11 22:55:13 2000
-@@ -3567,40 +3567,6 @@
+--- ltmain.sh.orig	Sat Oct 21 13:54:20 2000
++++ ltmain.sh	Sat Oct 21 13:54:11 2000
+@@ -1799,6 +1799,9 @@
+ 	  # rhapsody is a little odd...
+ 	  deplibs="$deplibs -framework System"
+ 	  ;;
++	*-*-openbsd*)
++	  # do not include libc due to us having libc/libc_r.
++	  ;;
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -3567,40 +3570,6 @@
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0