diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 3edc472ae8b..84cf06419b8 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2010/11/15 00:22:47 espie Exp $
+# $OpenBSD: Makefile,v 1.45 2011/10/23 09:14:19 ajacoutot Exp $
 
 COMMENT=	lame ain't an MP3 encoder
 
-DISTNAME=	lame-3.98.4
+DISTNAME=	lame-3.99
 
-SHARED_LIBS=	mp3lame	2.0	# .0.1
+SHARED_LIBS +=  mp3lame              2.0      # 0.0
 
 CATEGORIES=	audio
 
@@ -18,10 +18,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	MP3 patent, http://mp3licensing.com/royalty/
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c m ncurses
+WANTLIB += c m ncurses
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=lame/}
 
+MODULES=	converters/libiconv
+
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
 USE_LIBTOOL=	Yes
diff --git a/audio/lame/distinfo b/audio/lame/distinfo
index 21272bcfc3c..b3def6bb116 100644
--- a/audio/lame/distinfo
+++ b/audio/lame/distinfo
@@ -1,5 +1,5 @@
-MD5 (lame-3.98.4.tar.gz) = jphmrWtXDGyVyMukgGBHPw==
-RMD160 (lame-3.98.4.tar.gz) = TrKuby7HswEVwSZby/bxSQZQLps=
-SHA1 (lame-3.98.4.tar.gz) = 6ynHyTe5tzMMqXnfq8JasqMbnbI=
-SHA256 (lame-3.98.4.tar.gz) = rDFEx2YXIjqb5Kqj4opmtRvKsoFBBQw68EywaDb3csg=
-SIZE (lame-3.98.4.tar.gz) = 1336025
+MD5 (lame-3.99.tar.gz) = errNHQplpjczM1eGAVYm2w==
+RMD160 (lame-3.99.tar.gz) = 2OEPBgRkaxuo2tmwGlJfLG8oyWk=
+SHA1 (lame-3.99.tar.gz) = kd/SW+3AJ1kFGms68F5hM3pXUCg=
+SHA256 (lame-3.99.tar.gz) = 1x2ATCXKxpWSk5hlAzeHhJzvUrbJt4PtMeqNzr6tu7o=
+SIZE (lame-3.99.tar.gz) = 1441166
diff --git a/audio/lame/patches/patch-configure b/audio/lame/patches/patch-configure
index 9757735539d..650c3ccf210 100644
--- a/audio/lame/patches/patch-configure
+++ b/audio/lame/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.3 2008/08/20 09:02:03 ajacoutot Exp $
---- configure.orig	Sun Jun 29 23:40:05 2008
-+++ configure	Tue Jul 29 13:10:22 2008
-@@ -19705,7 +19705,7 @@ LIB_MAJOR_VERSION=0
+$OpenBSD: patch-configure,v 1.4 2011/10/23 09:14:19 ajacoutot Exp $
+--- configure.orig	Wed Apr 20 14:53:26 2011
++++ configure	Sun Oct 23 11:11:59 2011
+@@ -11044,7 +11044,7 @@ LIB_MAJOR_VERSION=0
  
  # increase this when changes are made, but they are upward compatible
  # to previous versions
diff --git a/audio/lame/patches/patch-frontend_Makefile_in b/audio/lame/patches/patch-frontend_Makefile_in
deleted file mode 100644
index cc538206c4f..00000000000
--- a/audio/lame/patches/patch-frontend_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-frontend_Makefile_in,v 1.3 2008/08/20 09:02:03 ajacoutot Exp $
---- frontend/Makefile.in.orig	Tue Jul 29 13:09:57 2008
-+++ frontend/Makefile.in	Tue Jul 29 13:10:06 2008
-@@ -152,7 +152,7 @@ LDADD = @LDADD@ \
- 	$(top_builddir)/libmp3lame/libmp3lame.la \
- 	@FRONTEND_LDADD@
- 
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
diff --git a/audio/lame/pkg/PLIST b/audio/lame/pkg/PLIST
index a57e6085dc8..571cf9857e7 100644
--- a/audio/lame/pkg/PLIST
+++ b/audio/lame/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2010/03/29 07:55:55 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.11 2011/10/23 09:14:19 ajacoutot Exp $
 @pkgpath audio/lame
 @pkgpath audio/lame,no_x11
 @bin bin/lame
@@ -9,14 +9,18 @@ lib/libmp3lame.a
 lib/libmp3lame.la
 @man man/man1/lame.1
 share/doc/lame/
-share/doc/lame/basic.html
+share/doc/lame/about.html
+share/doc/lame/abr.html
+share/doc/lame/cbr.html
+share/doc/lame/contact.html
 share/doc/lame/contributors.html
-share/doc/lame/examples.html
+share/doc/lame/detailed.html
 share/doc/lame/history.html
-share/doc/lame/id3.html
 share/doc/lame/index.html
-share/doc/lame/lame.css
-share/doc/lame/modes.html
-share/doc/lame/node6.html
-share/doc/lame/switchs.html
+share/doc/lame/introduction.html
+share/doc/lame/links.html
+share/doc/lame/list.html
+share/doc/lame/ms_stereo.html
+share/doc/lame/usage.html
+share/doc/lame/vbr.html
 %%SHARED%%