diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index b28574d1a41f..8b35131607ee 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -7,22 +7,29 @@
 
 PORTNAME=	libgig
 PORTVERSION=	3.3.0
+PORTREVISION=	1
 CATEGORIES=	audio
-MASTER_SITES=	http://download.linuxsampler.org/packages/
+MASTER_SITES=	SF/qsampler/${PORTNAME}/${PORTVERSION} \
+		http://download.linuxsampler.org/packages/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gigasampler file loader library
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
-		sndfile.1:${PORTSDIR}/audio/libsndfile
+		sndfile.1:${PORTSDIR}/audio/libsndfile \
+		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--mandir=${PREFIX}/man
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_UNSAFE=yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		dlsdump.1 gigdump.1 gigextract.1 rifftree.1
 
diff --git a/audio/libgig/pkg-plist b/audio/libgig/pkg-plist
index 8f3dfb68047b..ed8d01379f4c 100644
--- a/audio/libgig/pkg-plist
+++ b/audio/libgig/pkg-plist
@@ -1,12 +1,12 @@
-bin/rifftree
 bin/dlsdump
 bin/gigdump
 bin/gigextract
-include/RIFF.h
+bin/rifftree
 include/DLS.h
+include/RIFF.h
 include/gig.h
-lib/libgig.so.10
-lib/libgig.so
-lib/libgig.la
 lib/libgig.a
+lib/libgig.la
+lib/libgig.so
+lib/libgig.so.10
 libdata/pkgconfig/gig.pc