diff --git a/audio/libdiscid/Makefile b/audio/libdiscid/Makefile
index 22eef5f9d8a6..8bee74321086 100644
--- a/audio/libdiscid/Makefile
+++ b/audio/libdiscid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libdiscid
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://users.musicbrainz.org/~matt/ \
 		${MASTER_SITE_GENTOO}
@@ -16,13 +17,12 @@ MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	A library for creating MusicBrainz DiscIDs
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
+USE_AUTOTOOLS=	libtool
+USE_GNOME=	ltverhack gnomehack pkgconfig
+MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/libdiscid/files/patch-src__disc_freebsd.c b/audio/libdiscid/files/patch-src__disc_freebsd.c
new file mode 100644
index 000000000000..de09c129cc4e
--- /dev/null
+++ b/audio/libdiscid/files/patch-src__disc_freebsd.c
@@ -0,0 +1,10 @@
+--- ./src/disc_freebsd.c.orig	2011-03-27 08:20:45.000000000 -0400
++++ ./src/disc_freebsd.c	2011-03-27 08:21:02.000000000 -0400
+@@ -33,6 +33,7 @@
+ #include <sys/cdio.h>
+ #include <unistd.h>
+ #include <assert.h>
++#include <netinet/in.h>
+ 
+ 
+ #include "discid/discid_private.h"
diff --git a/audio/libdiscid/pkg-plist b/audio/libdiscid/pkg-plist
index 76ff7727f72b..dd4380beefa0 100644
--- a/audio/libdiscid/pkg-plist
+++ b/audio/libdiscid/pkg-plist
@@ -2,6 +2,6 @@ include/discid/discid.h
 lib/libdiscid.a
 lib/libdiscid.la
 lib/libdiscid.so
-lib/libdiscid.so.2
+lib/libdiscid.so.0
 libdata/pkgconfig/libdiscid.pc
 @dirrm include/discid