diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index ab55e6c1f8f6..d6e002b33d53 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnupod
-PORTVERSION=	0.99
+PORTVERSION=	0.99.2
 CATEGORIES=	audio perl5
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://www.blinkenlights.ch/gnupod-dist/stable/
@@ -34,15 +34,27 @@ USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
-CONFIGURE_ARGS=	--prefix=${PREFIX}
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--infodir=${PREFIX}/info \
+		--mandir=${PREFIX}/man
 CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
 
+OPTIONS=	FLAC "Enable FLAC support" off
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
 IGNORE=	gnupod only support perl 5.8 or above
 .endif
 
+.if exists(${SITE_PERL}/${PERL_ARCH}/Audio/FLAC/Header.pm)
+WITH_FLAC=	YES
+.endif
+
+.if defined(WITH_FLAC)
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Audio/FLAC/Header.pm:${PORTSDIR}/audio/p5-Audio-FLAC-Header
+.endif
+
 .ifndef(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/audio/gnupod/distinfo b/audio/gnupod/distinfo
index 2ffa38f14801..6072aaed0d10 100644
--- a/audio/gnupod/distinfo
+++ b/audio/gnupod/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnupod-0.99.tgz) = 6939b1623a2a700cccdbef0c4d7ae555
-SHA256 (gnupod-0.99.tgz) = 2c25c8e2ebd2612efddae14079884391195af2cb497f3a501174fd378c7080d4
-SIZE (gnupod-0.99.tgz) = 164195
+MD5 (gnupod-0.99.2.tgz) = 9e0ce9bf90ade64007e93595a74cd8a7
+SHA256 (gnupod-0.99.2.tgz) = c52bcc63cec709cb3924832ac17b0ca9c75e291ed583858ade4f6ddfdb6de72a
+SIZE (gnupod-0.99.2.tgz) = 173524
diff --git a/audio/gnupod/pkg-descr b/audio/gnupod/pkg-descr
index c3e970956a0d..1ebf11e63e57 100644
--- a/audio/gnupod/pkg-descr
+++ b/audio/gnupod/pkg-descr
@@ -1,4 +1,4 @@
-gnuPod is a collection of tools which allow you to use your iPod.
+GNUpod is a collection of tools which allow you to use your iPod.
 
 WWW: http://www.gnu.org/software/gnupod/