diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 26fc89932622..1ce13812aa60 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -1,98 +1,93 @@
 # New ports collection makefile for:	gpodder
 # Date created:		20 October 2007
 # Whom:			Chess Griffin <chess@chessgriffin.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	multimedia
 MASTER_SITES=	BERLIOS \
 		http://thpinfo.com/2010/mygpoclient/:mygpoclient
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
 		${MGC_DISTNAME}${EXTRACT_SUFX}:mygpoclient
 
 MAINTAINER=	steinex@nognu.de
 COMMENT=	A GTK2 podcast aggregrator written in Python
 
 RUN_DEPENDS=	py*-pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23 \
 		py*-sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
 		py*-notify>=0:${PORTSDIR}/devel/py-notify \
 		xdg-open:${PORTSDIR}/devel/xdg-utils \
 		wget:${PORTSDIR}/ftp/wget \
 		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		py*-feedparser>=0:${PORTSDIR}/textproc/py-feedparser \
 		py*-simplejson>=0:${PORTSDIR}/devel/py-simplejson
 
 OPTIONS=	COVERART "Cover Art syncing support" off \
 		IPOD "iPod synchronization support" off \
 		MP3TAG "MP3 ID3 tag update support" off \
 		OGG2MP3 "Ogg Vorbis conversion to MP3 support" off \
-		SHOWNOTES "HTML episode shownotes support" off \
-		VIDEO "Video media support using mplayer" off
+		SHOWNOTES "HTML episode shownotes support" off
 
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 ALL_TARGET=	messages
 INSTALLS_ICONS=	yes
 INSTALLS_EGGINFO=yes
 
 MAN1=		gpo.1 ${PORTNAME}.1 ${PORTNAME}-backup.1
 
 MGC_DISTNAME=	mygpoclient-1.0
 MGC_WRKSRC=	${WRKDIR}/${MGC_DISTNAME}/mygpoclient
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_COVERART)
 RUN_DEPENDS+=	py*-imaging>=0:${PORTSDIR}/graphics/py-imaging
 .endif
 
 .if defined(WITH_IPOD)
 LIB_DEPENDS+=	gpod.5:${PORTSDIR}/audio/libgpod
 RUN_DEPENDS+=	py*-mad>=0:${PORTSDIR}/audio/py-mad
 .if !exists(${PYTHON_SITELIBDIR}/gpod/__init__.py)
 IGNORE=		Requires Python bindings for libgpod. Please uninstall libgpod and reinstall with Python support.
 .endif
 .endif
 
 .if defined(WITH_MP3TAG)
 RUN_DEPENDS+=	py*-eyed3>=0:${PORTSDIR}/audio/py-eyed3
 .endif
 
 .if defined(WITH_OGG2MP3)
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
 		oggdec:${PORTSDIR}/audio/vorbis-tools
 .endif
 
 .if defined(WITH_SHOWNOTES)
 USE_GNOME+=	pygnomeextras
 .endif
 
-.if defined(WITH_VIDEO)
-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile
 
 pre-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${MGC_WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${MGC_WRKSRC}
 
 pre-install:
 	@${MKDIR} ${PYTHON_SITELIBDIR}/mygpoclient
 	@(cd ${MGC_WRKSRC} && ${COPYTREE_SHARE} . ${PYTHON_SITELIBDIR}/mygpoclient)
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in PKG-INFO README
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index cbc5fdbc0c8a..89f8a3cdda88 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,6 +1,6 @@
-MD5 (gpodder-2.4.tar.gz) = 3d0ffc2c30053c94e99feb302f4f8b83
-SHA256 (gpodder-2.4.tar.gz) = e1f52c91c96923571c045f0349f52253235e66208f256a7f434047157c87c064
-SIZE (gpodder-2.4.tar.gz) = 968875
+MD5 (gpodder-2.5.tar.gz) = b7454045bd5917e4b9d16dd45d14ece7
+SHA256 (gpodder-2.5.tar.gz) = 9b796bfacc369fb6207110f73f5476d3dd2ad81b649d55eedd76aa56d3aa0df3
+SIZE (gpodder-2.5.tar.gz) = 970514
 MD5 (mygpoclient-1.0.tar.gz) = 1e0cdad9a329b76b6eb19426e8efd787
 SHA256 (mygpoclient-1.0.tar.gz) = 50634aca62705c8d780c2f5333d1a30c0ddc448c9b683fb4531769f30988923c
 SIZE (mygpoclient-1.0.tar.gz) = 28244
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index ae3bb7ac8800..2fb8db4abe47 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -1,232 +1,234 @@
 bin/gpo
 bin/gpodder
 bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/__init__.py
 %%PYTHON_SITELIBDIR%%/gpodder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/api.py
 %%PYTHON_SITELIBDIR%%/gpodder/api.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/config.py
 %%PYTHON_SITELIBDIR%%/gpodder/config.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/console.py
 %%PYTHON_SITELIBDIR%%/gpodder/console.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/corestats.py
 %%PYTHON_SITELIBDIR%%/gpodder/corestats.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/dbsqlite.py
 %%PYTHON_SITELIBDIR%%/gpodder/dbsqlite.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/dbusproxy.py
 %%PYTHON_SITELIBDIR%%/gpodder/dbusproxy.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/download.py
 %%PYTHON_SITELIBDIR%%/gpodder/download.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/feedcore.py
 %%PYTHON_SITELIBDIR%%/gpodder/feedcore.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/gpodderosx.py
+%%PYTHON_SITELIBDIR%%/gpodder/gpodderosx.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gstreamer.py
 %%PYTHON_SITELIBDIR%%/gpodder/gstreamer.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/dependencymanager.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/dependencymanager.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/shownotes.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/shownotes.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/syncprogress.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/syncprogress.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/trayicon.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/trayicon.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/shownotes.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/shownotes.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/welcome.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/welcome.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/mygpodder.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/mygpodder.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.py
 %%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/gui.py
 %%PYTHON_SITELIBDIR%%/gpodder/gui.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/launcher.py
 %%PYTHON_SITELIBDIR%%/gpodder/launcher.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/libconverter.py
 %%PYTHON_SITELIBDIR%%/gpodder/libconverter.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/liblogger.py
 %%PYTHON_SITELIBDIR%%/gpodder/liblogger.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/minidb.py
 %%PYTHON_SITELIBDIR%%/gpodder/minidb.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/model.py
 %%PYTHON_SITELIBDIR%%/gpodder/model.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/my.py
 %%PYTHON_SITELIBDIR%%/gpodder/my.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/opml.py
 %%PYTHON_SITELIBDIR%%/gpodder/opml.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/qtui.py
 %%PYTHON_SITELIBDIR%%/gpodder/qtui.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/services.py
 %%PYTHON_SITELIBDIR%%/gpodder/services.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/soundcloud.py
 %%PYTHON_SITELIBDIR%%/gpodder/soundcloud.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/sync.py
 %%PYTHON_SITELIBDIR%%/gpodder/sync.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/unittests.py
 %%PYTHON_SITELIBDIR%%/gpodder/unittests.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/util.py
 %%PYTHON_SITELIBDIR%%/gpodder/util.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.py
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/__init__.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/__init__.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/api.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/api.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/api.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/api_test.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/api_test.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/api_test.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/http.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/http.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/http.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/http_test.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/http_test.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/http_test.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/json.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/json.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/json.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/json_test.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/json_test.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/json_test.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/locator.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/locator.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/locator.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/locator_test.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/locator_test.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/locator_test.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/public.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/public.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/public.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/public_test.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/public_test.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/public_test.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/simple.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/simple.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/simple.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/simple_test.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/simple_test.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/simple_test.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/testing.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/testing.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/testing.pyo
 %%PYTHON_SITELIBDIR%%/mygpoclient/util.py
 %%PYTHON_SITELIBDIR%%/mygpoclient/util.pyc
 %%PYTHON_SITELIBDIR%%/mygpoclient/util.pyo
 share/applications/gpodder.desktop
 share/dbus-1/services/org.gpodder.service
 %%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/credits.txt
 %%DATADIR%%/folder.png
 %%DATADIR%%/ipod.png
 %%DATADIR%%/mtp.png
 %%DATADIR%%/podcast-0.png
 %%DATADIR%%/podcast-1.png
 %%DATADIR%%/podcast-2.png
 %%DATADIR%%/podcast-3.png
 %%DATADIR%%/podcast-4.png
 %%DATADIR%%/podcast-all.png
 %%DATADIR%%/ui/desktop/gpodder.ui
 %%DATADIR%%/ui/desktop/gpodderaddpodcast.ui
 %%DATADIR%%/ui/desktop/gpodderchannel.ui
 %%DATADIR%%/ui/desktop/gpodderconfigeditor.ui
 %%DATADIR%%/ui/desktop/gpodderdependencymanager.ui
 %%DATADIR%%/ui/desktop/gpodderdeviceplaylist.ui
 %%DATADIR%%/ui/desktop/gpodderepisodeselector.ui
 %%DATADIR%%/ui/desktop/gpodderpodcastdirectory.ui
 %%DATADIR%%/ui/desktop/gpodderpreferences.ui
 %%DATADIR%%/ui/desktop/gpoddershownotes.ui
 %%DATADIR%%/ui/desktop/gpoddersyncprogress.ui
 %%DATADIR%%/ui/gpodderwelcome.ui
 %%DATADIR%%/ui/mygpoddersettings.ui
 share/icons/hicolor/16x16/apps/gpodder.png
 share/icons/hicolor/22x22/apps/gpodder.png
 share/icons/hicolor/24x24/apps/gpodder.png
 share/icons/hicolor/48x48/apps/gpodder.png
 share/icons/hicolor/scalable/apps/gpodder.svg
 share/locale/cs/LC_MESSAGES/gpodder.mo
 share/locale/da/LC_MESSAGES/gpodder.mo
 share/locale/de/LC_MESSAGES/gpodder.mo
 share/locale/es/LC_MESSAGES/gpodder.mo
 share/locale/fi/LC_MESSAGES/gpodder.mo
 share/locale/fr/LC_MESSAGES/gpodder.mo
 share/locale/gl/LC_MESSAGES/gpodder.mo
 share/locale/it/LC_MESSAGES/gpodder.mo
 share/locale/kk/LC_MESSAGES/gpodder.mo
 share/locale/nb/LC_MESSAGES/gpodder.mo
 share/locale/nl/LC_MESSAGES/gpodder.mo
 share/locale/nn/LC_MESSAGES/gpodder.mo
 share/locale/pl/LC_MESSAGES/gpodder.mo
 share/locale/pt/LC_MESSAGES/gpodder.mo
 share/locale/pt_BR/LC_MESSAGES/gpodder.mo
 share/locale/ro/LC_MESSAGES/gpodder.mo
 share/locale/ru/LC_MESSAGES/gpodder.mo
 share/locale/sv/LC_MESSAGES/gpodder.mo
 share/locale/uk/LC_MESSAGES/gpodder.mo
 share/pixmaps/gpodder.png
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor/24x24/apps
 @dirrmtry share/icons/hicolor/24x24
 @dirrmtry share/icons/hicolor/22x22/apps
 @dirrmtry share/icons/hicolor/22x22
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrm %%DATADIR%%/ui/desktop
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/mygpoclient
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder