diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index 1c6305736d4..793526b3154 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,13 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2001/11/10 15:00:47 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2002/02/01 15:18:01 naddy Exp $
 
 COMMENT=	"free lossless audio codec"
-COMMENT-xmms=	"XMMS input plugin for playing FLAC files"
 
-VERSION=	1.0
-DISTNAME=	flac-${VERSION}
-PKGNAME-xmms=	xmms-flac-${VERSION}
+DISTNAME=	flac-1.0.2
 CATEGORIES=	audio archivers
-NEED_VERSION=	1.474
+NEED_VERSION=	1.504
 HOMEPAGE=	http://flac.sourceforge.net/
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
@@ -21,36 +18,24 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	flac
 EXTRACT_SUFX=		-src.tar.gz
 
-# architectures XMMS runs on
-.if ${MACHINE_ARCH} == "i386"
-MULTI_PACKAGES=	-xmms
-SUBPACKAGE?=
-.  if !defined(PACKAGING)
-LIB_DEPENDS+=	xmms.2::audio/xmms
-.  endif
-.else
-CONFIGURE_ENV=	XMMS_CONFIG=/usr/bin/false
-.endif
+LIB_DEPENDS=	ogg.3::audio/libogg
 
 .if ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS+=	::devel/nasm
 .endif
 
-USE_LIBTOOL=	Yes	# included libtool is broken
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-static
-
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-xmms"
-LIB_DEPENDS=	FLAC.1::audio/flac
-RUN_DEPENDS=	::audio/xmms
-.endif
+CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
+		--enable-sse --enable-3dnow
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${WRKBUILD}/src/libFLAC/.libs -L${LOCALBASE}/lib" \
+		XMMS_CONFIG=/usr/bin/false
+MAKE_ENV=	INCLUDES="-I${WRKSRC}/include"
 
 DOCDIR=		${PREFIX}/share/doc/flac
 
-post-extract:
+pre-build:
 	@rm -rf ${WRKSRC}/obj
-# configure ignores LIBTOOL
-	@cd ${LOCALBASE}/share/libtool && cp ltconfig ltmain.sh ${WRKSRC}
 
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
diff --git a/audio/flac/distinfo b/audio/flac/distinfo
new file mode 100644
index 00000000000..36487e4de56
--- /dev/null
+++ b/audio/flac/distinfo
@@ -0,0 +1,3 @@
+MD5 (flac-1.0.2-src.tar.gz) = 3b0c646f1e58d5345f3c555c3996885d
+RMD160 (flac-1.0.2-src.tar.gz) = c2619f3a31200871b8a89f50d03b27333d6e5c74
+SHA1 (flac-1.0.2-src.tar.gz) = b712611a2902a5a165a1ef205a7b3ebe9695b560
diff --git a/audio/flac/files/md5 b/audio/flac/files/md5
deleted file mode 100644
index c0024fb221f..00000000000
--- a/audio/flac/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (flac-1.0-src.tar.gz) = 137a0f31ef41583e875928f84d9f8d11
-RMD160 (flac-1.0-src.tar.gz) = 2ba5500609859e748dc565e19d5c38786ff8d3f4
-SHA1 (flac-1.0-src.tar.gz) = acfd76e56dafdad843adcf680a51ecf48911142e
diff --git a/audio/flac/patches/patch-configure b/audio/flac/patches/patch-configure
index f91356a89ae..e47cf84106e 100644
--- a/audio/flac/patches/patch-configure
+++ b/audio/flac/patches/patch-configure
@@ -1,17 +1,8 @@
-$OpenBSD: patch-configure,v 1.3 2001/07/26 17:37:46 naddy Exp $
---- configure.orig	Sun Jul 22 20:03:23 2001
-+++ configure	Mon Jul 23 23:15:53 2001
-@@ -1578,7 +1578,7 @@ else
-   FLaC__CPU_SPARC_FALSE=
+$OpenBSD: patch-configure,v 1.4 2002/02/01 15:18:02 naddy Exp $
+--- configure.orig	Tue Dec  4 08:10:10 2001
++++ configure	Thu Jan 17 21:24:11 2002
+@@ -8240,11 +8240,11 @@ echo "$as_me: error: No unsigned 64 bit 
  fi
- case "$host" in
--	i3-686-*-openbsd*) OBJ_FORMAT=aoutb ;;
-+	i386-*-openbsd*) OBJ_FORMAT=aoutb ;;
- 	*) OBJ_FORMAT=elf ;;
- esac
- 
-@@ -2136,11 +2136,11 @@ fi
- 
  
  SAVE_CFLAGS="$CFLAGS"
 -CFLAGS='-I$(top_builddir) -I$(srcdir)/include -I $(top_srcdir)/include -Wall -W'
diff --git a/audio/flac/patches/patch-man_Makefile_in b/audio/flac/patches/patch-man_Makefile_in
deleted file mode 100644
index 916ed4d228c..00000000000
--- a/audio/flac/patches/patch-man_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-man_Makefile_in,v 1.1 2001/07/26 17:37:46 naddy Exp $
---- man/Makefile.in.orig	Sun Jul 22 17:48:59 2001
-+++ man/Makefile.in	Sun Jul 22 17:49:13 2001
-@@ -254,7 +254,7 @@ maintainer-clean-generic clean mostlycle
- 
- 
- flac.1: flac.sgml
--	docbook-to-man $< > $@ || docbook2man $< > $@
-+	docbook-to-man $? > $@ || docbook2man $? > $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/audio/flac/patches/patch-src_plugin_xmms_Makefile_in b/audio/flac/patches/patch-src_plugin_xmms_Makefile_in
deleted file mode 100644
index e3dd8338d5a..00000000000
--- a/audio/flac/patches/patch-src_plugin_xmms_Makefile_in
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_plugin_xmms_Makefile_in,v 1.1 2001/07/26 17:37:46 naddy Exp $
---- src/plugin_xmms/Makefile.in.orig	Tue Jul 24 20:56:15 2001
-+++ src/plugin_xmms/Makefile.in	Tue Jul 24 20:56:47 2001
-@@ -117,8 +117,8 @@ LIBTOOL = $(top_builddir)/libtool-disabl
- 
- xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
- libxmms_flac_la_SOURCES = plugin.c
--libxmms_flac_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la @XMMS_LIBS@
--#libxmms_flac_la_LIBADD = -L$(top_builddir)/src/libFLAC/.libs -lFLAC @XMMS_LIBS@
-+#libxmms_flac_la_LIBADD = $(top_builddir)/src/libFLAC/libFLAC.la @XMMS_LIBS@
-+libxmms_flac_la_LIBADD = -L$(top_builddir)/src/libFLAC/.libs -lFLAC @XMMS_LIBS@
- libxmms_flac_la_LDFLAGS = -module -avoid-version
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
diff --git a/audio/flac/patches/patch-src_test_streams_main_c b/audio/flac/patches/patch-src_test_streams_main_c
deleted file mode 100644
index ac7857e5f75..00000000000
--- a/audio/flac/patches/patch-src_test_streams_main_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_test_streams_main_c,v 1.1 2001/10/25 14:15:57 naddy Exp $
---- src/test_streams/main.c.orig	Thu Oct 25 15:18:25 2001
-+++ src/test_streams/main.c	Thu Oct 25 15:20:43 2001
-@@ -38,6 +38,9 @@
- 
- static FLAC__bool is_big_endian_host;
- 
-+#ifdef swap16
-+#undef swap16
-+#endif
- static void swap16(FLAC__int16 *i)
- {
- 	unsigned char *x = (unsigned char *)i, b;
diff --git a/audio/flac/pkg/DESCR-xmms b/audio/flac/pkg/DESCR-xmms
deleted file mode 100644
index e86ae7134fc..00000000000
--- a/audio/flac/pkg/DESCR-xmms
+++ /dev/null
@@ -1,5 +0,0 @@
-FLAC stands for Free Lossless Audio Codec.
-
-This is an XMMS input plugin for FLAC files.
-
-WWW: ${HOMEPAGE}
diff --git a/audio/flac/pkg/PFRAG.shared b/audio/flac/pkg/PFRAG.shared
index 1686861c0ca..796516374b5 100644
--- a/audio/flac/pkg/PFRAG.shared
+++ b/audio/flac/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/07/26 17:37:46 naddy Exp $
-lib/libFLAC.so.1.0
+@comment $OpenBSD: PFRAG.shared,v 1.3 2002/02/01 15:18:02 naddy Exp $
+lib/libFLAC.so.2.1
 DYNLIBDIR(%B)
diff --git a/audio/flac/pkg/PFRAG.shared-xmms b/audio/flac/pkg/PFRAG.shared-xmms
deleted file mode 100644
index 95565915623..00000000000
--- a/audio/flac/pkg/PFRAG.shared-xmms
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-xmms,v 1.1 2001/07/26 17:37:46 naddy Exp $
-lib/xmms/Input/libxmms-flac.so
diff --git a/audio/flac/pkg/PLIST b/audio/flac/pkg/PLIST
index e98b5df8e3b..6f74d6b11f0 100644
--- a/audio/flac/pkg/PLIST
+++ b/audio/flac/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/07/26 17:37:46 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/02/01 15:18:02 naddy Exp $
 bin/flac
 bin/metaflac
 include/FLAC/all.h
@@ -7,6 +7,7 @@ include/FLAC/file_decoder.h
 include/FLAC/format.h
 include/FLAC/ordinals.h
 include/FLAC/seek_table.h
+include/FLAC/seekable_stream_decoder.h
 include/FLAC/stream_decoder.h
 include/FLAC/stream_encoder.h
 include/FLAC/utility.h
diff --git a/audio/flac/pkg/PLIST-xmms b/audio/flac/pkg/PLIST-xmms
deleted file mode 100644
index 550f36634cc..00000000000
--- a/audio/flac/pkg/PLIST-xmms
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-xmms,v 1.1 2001/07/26 17:37:46 naddy Exp $
-%%SHARED%%