diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index 7b616f300f69..dd470517de41 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -1,20 +1,21 @@
 # Created by: David MacKenzie <djm@pix.net>
 # $FreeBSD$
 
 PORTNAME=	id3v2
 PORTVERSION=	0.1.12
 CATEGORIES=	audio
 MASTER_SITES=	SF
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Command line id3v2 tag editor
 
-LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib
+LICENSE=	LGPL21
+
+LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib
 
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
 
-MAN1=		id3v2.1
-PLIST_FILES=	bin/id3v2
+PLIST_FILES=	bin/id3v2 \
+		man/man1/id3v2.1.gz
 
 .include <bsd.port.mk>
diff --git a/audio/id3v2/files/patch-Makefile b/audio/id3v2/files/patch-Makefile
index 9ca11b92c911..28130bda2f46 100644
--- a/audio/id3v2/files/patch-Makefile
+++ b/audio/id3v2/files/patch-Makefile
@@ -1,39 +1,39 @@
 --- Makefile.orig	2010-03-27 07:28:34.000000000 +0800
 +++ Makefile	2010-05-15 02:52:55.000000000 +0800
 @@ -1,20 +1,21 @@
 -all: id3v2
 +all:	clean id3v2
  
  VERSION=0.1.12
  
 -PREFIX=	/opt/local
 -CXXFLAGS+=	-Wall -I${PREFIX}/include/ -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
 -LDFLAGS+=	-L${PREFIX}/lib/ 
 +#PREFIX=	/opt/local
 +CXXFLAGS+=	-I${LOCALBASE}/include -DVERSION="\"${VERSION}\"" #-DSORT_RUNTIME
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +MAKEOBJDIR=	${.CURDIR}	# ignore objwarn: in <bsd.obj.mk>
  
  id3v2:	convert.o list.o id3v2.o genre.o
 -	${CXX} ${LDFLAGS} -pedantic -Wall -g -o $@ $^ -lz -lid3
 +	${CXX} ${LDFLAGS} -lz -lid3 -o $@ $>
  
  create_map: create_map.o
  	${CXX} -Wall -g -o $@ $^
  
 -install: all
 -	install -c -s id3v2 ${PREFIX}/bin/id3v2
 -	nroff -man id3v2.1 > ${PREFIX}/share/man/man1/id3v2.1
 +install:
-+	${BSD_INSTALL_PROGRAM} id3v2 ${PREFIX}/bin
-+	${BSD_INSTALL_MAN} id3v2.1 ${PREFIX}/man/man1
++	${BSD_INSTALL_PROGRAM} id3v2 ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_MAN} id3v2.1 ${DESTDIR}${PREFIX}/man/man1
  
  clean:
  	rm -f id3v2 create_map core *.o
 @@ -25,4 +26,5 @@
  		--exclude=id3v2-${VERSION}/id3v2-${VERSION} \
  		id3v2-${VERSION}
  	rm id3v2-${VERSION}
 -	
 +
 +.include <bsd.prog.mk>