diff --git a/devel/libaudiofile/Makefile b/devel/libaudiofile/Makefile
index 6507bc7c7ee..3f93fe7bd78 100644
--- a/devel/libaudiofile/Makefile
+++ b/devel/libaudiofile/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.19 2001/04/18 01:49:50 brad Exp $
+# $OpenBSD: Makefile,v 1.20 2001/07/20 14:33:02 brad Exp $
 
 COMMENT=	"SGI audiofile library GPLed clone"
 
-DISTNAME=	audiofile-0.2.1
+DISTNAME=	audiofile-0.2.2
 PKGNAME=	lib${DISTNAME}
 CATEGORIES=	devel
-NEED_VERSION=	1.384
-MASTER_SITES=	ftp://ftp.68k.org/pub/michael/ \
-		${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= stable/sources/audiofile
+NEED_VERSION=	1.413
+MASTER_SITES=	ftp://oss.sgi.com/projects/audiofile/download/
 
-HOMEPAGE=	http://www.68k.org./~michael/audiofile/
+HOMEPAGE=	http://oss.sgi.com/projects/audiofile/
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
diff --git a/devel/libaudiofile/files/md5 b/devel/libaudiofile/files/md5
index 4218d7e7250..4dcfbf4f042 100644
--- a/devel/libaudiofile/files/md5
+++ b/devel/libaudiofile/files/md5
@@ -1,3 +1,3 @@
-MD5 (audiofile-0.2.1.tar.gz) = e0a9205ac868350ab9aee78f1d282aa5
-RMD160 (audiofile-0.2.1.tar.gz) = 691006f73277803d4ee0af892042df4583d38f96
-SHA1 (audiofile-0.2.1.tar.gz) = 3180c180fe0b870bfd52fe00fe5b123cc6282c23
+MD5 (audiofile-0.2.2.tar.gz) = 7a088be2b91f7effaaa3197548c8926a
+RMD160 (audiofile-0.2.2.tar.gz) = f2b808f48b279d2278a399469c576e39adb122e9
+SHA1 (audiofile-0.2.2.tar.gz) = 9507bda17a9ca687e019f0c85a77b6585c68e712
diff --git a/devel/libaudiofile/patches/patch-libaudiofile_modules_Makefile.in b/devel/libaudiofile/patches/patch-libaudiofile_modules_Makefile.in
deleted file mode 100644
index e3c7c57b3e3..00000000000
--- a/devel/libaudiofile/patches/patch-libaudiofile_modules_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libaudiofile/modules/Makefile.in.orig	Sat Mar  3 11:03:03 2001
-+++ libaudiofile/modules/Makefile.in	Sat Mar  3 11:07:04 2001
-@@ -78,7 +78,7 @@
- 
- noinst_LTLIBRARIES = libmodules.la
- 
--INCLUDES = -I.. -I../../libaudioutil
-+INCLUDES = -I$(top_srcdir)/libaudiofile
- 
- libmodules_la_SOURCES =  	g711.c g711.h 	pcm.c pcm.h 	rebuffer.c rebuffer.h 	rebuffer.template
- 
diff --git a/devel/libaudiofile/patches/patch-ltconfig b/devel/libaudiofile/patches/patch-ltconfig
index 0efe73d906b..e34d1d3a9f5 100644
--- a/devel/libaudiofile/patches/patch-ltconfig
+++ b/devel/libaudiofile/patches/patch-ltconfig
@@ -1,6 +1,6 @@
---- ltconfig.orig	Fri Dec  8 16:05:55 2000
-+++ ltconfig	Sun Feb 18 10:09:38 2001
-@@ -1105,6 +1105,9 @@
+--- ltconfig.orig	Thu Jul 19 22:06:24 2001
++++ ltconfig	Fri Jul 20 09:57:42 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
    ;;
@@ -10,7 +10,7 @@
  
  esac
  
-@@ -1396,10 +1399,21 @@
+@@ -1402,10 +1405,21 @@ else
      ;;
  
    openbsd*)
@@ -34,7 +34,7 @@
      ;;
  
    os2*)
-@@ -1997,13 +2011,10 @@
+@@ -2021,13 +2035,10 @@ netbsd*)
  
  openbsd*)
    version_type=sunos
diff --git a/devel/libaudiofile/patches/patch-ltmain.sh b/devel/libaudiofile/patches/patch-ltmain.sh
index ed058f71e2a..0ac5a43a890 100644
--- a/devel/libaudiofile/patches/patch-ltmain.sh
+++ b/devel/libaudiofile/patches/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Fri Dec  8 16:05:55 2000
-+++ ltmain.sh	Sun Feb 18 09:58:38 2001
-@@ -1079,6 +1079,17 @@
+--- ltmain.sh.orig	Thu Jul 19 22:06:24 2001
++++ ltmain.sh	Fri Jul 20 09:57:43 2001
+@@ -1079,6 +1079,17 @@ compiler."
  	    # These systems don't actually have c library (as such)
  	    continue
  	    ;;
@@ -18,7 +18,7 @@
  	  esac
  	elif test "$arg" = "-lm"; then
  	  case "$host" in
-@@ -1091,6 +1102,10 @@
+@@ -1091,6 +1102,10 @@ compiler."
  	deplibs="$deplibs $arg"
  	;;
  
@@ -29,9 +29,9 @@
        -module)
  	module=yes
  	continue
-@@ -1795,6 +1810,9 @@
- 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- 	  # these systems don't actually have a c library (as such)!
+@@ -1799,6 +1814,9 @@ compiler."
+ 	  # rhapsody is a little odd...
+ 	  deplibs="$deplibs -framework System"
  	  ;;
 +	*-*-openbsd*)
 +	  # Do not include libc due to us having libc/libc_r.
@@ -39,7 +39,7 @@
  	*)
  	  # Add libc to deplibs on all other systems.
  	  deplibs="$deplibs -lc"
-@@ -3555,40 +3573,6 @@
+@@ -3571,40 +3589,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
  
diff --git a/devel/libaudiofile/pkg/PFRAG.shared b/devel/libaudiofile/pkg/PFRAG.shared
index eff74a58acd..3c1fb6a82f1 100644
--- a/devel/libaudiofile/pkg/PFRAG.shared
+++ b/devel/libaudiofile/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2000/12/31 19:45:33 brad Exp $
-lib/libaudiofile.so.0.1
+@comment $OpenBSD: PFRAG.shared,v 1.3 2001/07/20 14:33:02 brad Exp $
+lib/libaudiofile.so.0.2
 DYNLIBDIR(%B)