diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 0aa5d0166bfb..09ab809a2f42 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libgpod
-PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTVERSION=	0.8.3
 CATEGORIES=	audio
 MASTER_SITES=	SF/gtkpod/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
 
@@ -12,14 +11,13 @@ COMMENT=	Library for direct access to iPod contents
 
 LICENSE=	LGPL20
 
-LIB_DEPENDS=	plist:${PORTSDIR}/devel/libplist \
-		tag:${PORTSDIR}/audio/taglib \
-		sgutils2:${PORTSDIR}/sysutils/sg3_utils
+LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libsgutils2.so:${PORTSDIR}/sysutils/sg3_utils
 
-USE_GNOME=	gtk20
-NO_STAGE=	yes
+USE_GNOME=	gdkpixbuf2 gtk20
 USE_SQLITE=	3
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pathfix pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-udev --without-hal \
@@ -29,62 +27,41 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	IMOBILE MONO PYTHON
+OPTIONS_DEFINE=	DOCS IMOBILE MONO PYTHON
 OPTIONS_DEFAULT=IMOBILE
+OPTIONS_SUB=	yes
 
 IMOBILE_DESC=	Apple iPhone/iPod Touch support
 
+MONO_USE=		GNOME=gtksharp20
+MONO_CONFIGURE_WITH=	mono
+
+PYTHON_BUILD_DEPENDS=	swig2.0:${PORTSDIR}/devel/swig20 \
+			${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+PYTHON_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
+PYTHON_USE=		GNOME=pygobject PYTHON=yes
+PYTHON_CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig2.0"
+PYTHON_CONFIGURE_WITH=	python
+
 PORTDOCS=	ChangeLog NEWS README*
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMONO}
-USE_GNOME+=	gtksharp20
-CONFIGURE_ARGS+=--with-mono
-PLIST_SUB+=	MONO=""
-.else
-CONFIGURE_ARGS+=--without-mono
-PLIST_SUB+=	MONO="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-BUILD_DEPENDS+=	swig2.0:${PORTSDIR}/devel/swig20 \
-		${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/mutagen/__init__.py:${PORTSDIR}/audio/py-mutagen
-USE_GNOME+=	pygobject
-USE_PYTHON=	yes
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--without-python
-PLIST_SUB+=	PYTHON="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MIMOBILE} && (${OSVERSION} > 900002 || \
 	${OSVERSION} < 900000 && ${OSVERSION} > 800107)
 COMMENT:=	${COMMENT:S,iPod,&/iPhone,}
-LIB_DEPENDS+=	imobiledevice:${PORTSDIR}/comms/libimobiledevice
+LIB_DEPENDS+=	libimobiledevice.so:${PORTSDIR}/comms/libimobiledevice
 CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
 .else
 CONFIGURE_ARGS+=--without-libimobiledevice
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,libdir)/pkgconfig,prefix)/libdata/pkgconfig,' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/bindings/mono/libgpod-sharp/Makefile.in
 # Allow to build tools without HAL
 	@${REINPLACE_CMD} -e '/noinst_PROGRAMS =/ s,^,@HAVE_HAL_TRUE@,' \
 		${WRKSRC}/tools/Makefile.in
-.if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's, docs,,' \
-		${WRKSRC}/Makefile.in
-.endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
-.endif
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/audio/libgpod/distinfo b/audio/libgpod/distinfo
index c127b0c8e52d..5ab7a50bb90c 100644
--- a/audio/libgpod/distinfo
+++ b/audio/libgpod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgpod-0.8.2.tar.bz2) = 0054e9b0060d7b923cdc1b748b6617f4dc9f1401fb6bc9368f9960537c55a092
-SIZE (libgpod-0.8.2.tar.bz2) = 777945
+SHA256 (libgpod-0.8.3.tar.bz2) = 638a7959d04e95f1e62abad02bd33702e4e8dfef98485ac7d9d50395c37e955d
+SIZE (libgpod-0.8.3.tar.bz2) = 801903
diff --git a/audio/libgpod/pkg-plist b/audio/libgpod/pkg-plist
index 9f192f06a7db..18462d580f86 100644
--- a/audio/libgpod/pkg-plist
+++ b/audio/libgpod/pkg-plist
@@ -24,7 +24,7 @@ lib/libgpod.so.7
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/gpod/ipod.pyo
 libdata/pkgconfig/libgpod-1.0.pc
-libdata/pkgconfig/libgpod-sharp.pc
+%%MONO%%libdata/pkgconfig/libgpod-sharp.pc
 %%PORTDOCS%%%%DOCSDIR%%/ch01.html
 %%PORTDOCS%%%%DOCSDIR%%/home.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
@@ -42,7 +42,6 @@ libdata/pkgconfig/libgpod-sharp.pc
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-The-Itdb-iTunesDB-structure.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Time-handling.html
 %%PORTDOCS%%%%DOCSDIR%%/libgpod-Tracks.html
-%%PORTDOCS%%%%DOCSDIR%%/libgpod.devhelp
 %%PORTDOCS%%%%DOCSDIR%%/libgpod.devhelp2
 %%PORTDOCS%%%%DOCSDIR%%/photodb.html
 %%PORTDOCS%%%%DOCSDIR%%/right.png
@@ -58,6 +57,8 @@ share/locale/ro/LC_MESSAGES/libgpod.mo
 share/locale/sv/LC_MESSAGES/libgpod.mo
 share/locale/zh_CN/LC_MESSAGES/libgpod.mo
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/gpod
+%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
+%%PYTHON%%@dirrmtry %%PYTHON_LIBDIR%%
 %%MONO%%@dirrm lib/libgpod
 @dirrm include/gpod-1.0/gpod
 @dirrm include/gpod-1.0