diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index 6e6668fc9dce..f9a12bbd0c0b 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -1,95 +1,70 @@
 # New ports collection makefile for:	gpodder
-# Date created:		20 October 2007
-# Whom:			Chess Griffin <chess@chessgriffin.com>
+# Date created:				20 October 2007
+# Whom:					Chess Griffin <chess@chessgriffin.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gpodder
-PORTVERSION=	2.20.1
-CATEGORIES=	multimedia
-MASTER_SITES=	http://gpodder.org/src/ \
-		http://thp.io/2010/mygpoclient/:mygpoclient \
-		CHEESESHOP:mygpoclient
-MASTER_SITE_SUBDIR=	source/m/mygpoclient/:mygpoclient
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}:DEFAULT \
-		${MGC_DISTNAME}${EXTRACT_SUFX}:mygpoclient
+PORTVERSION=	3.1.1
+CATEGORIES=	multimedia python
+MASTER_SITES=	http://gpodder.org/src/
 
 MAINTAINER=	rm@FreeBSD.org
-COMMENT=	A GTK2 podcast aggregrator written in Python
+COMMENT=	Media aggregator and podcast client
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
+		help2man:${PORTSDIR}/misc/help2man
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}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 \
-		${PYTHON_PKGNAMEPREFIX}feedparser>=0:${PORTSDIR}/textproc/py-feedparser
+		${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:${PORTSDIR}/textproc/py-feedparser \
+		${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.4:${PORTSDIR}/devel/py-mygpoclient \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
 
-OPTIONS=	COVERART "Cover Art syncing support" off \
-		IPOD "iPod synchronization support" off \
-		MP3TAG "MP3 ID3 tag update support" off \
+OPTIONS=	GTK "With GTK UI" off \
+		NOTIFY "Display notification bubbles for different events" off \
+		MUTAGEN "Allow metadata manipulation" off \
 		OGG2MP3 "Ogg Vorbis conversion to MP3 support" off \
-		SHOWNOTES "HTML episode shownotes support" off
 
-USE_PYTHON=	-2.7
-USE_GNOME=	pygtk2
+ALL_TARGET=	messages
+MAKE_ENV=	GPODDER_INSTALL_UIS="cli"
+MAKEFILE=	makefile
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-ALL_TARGET=	messages
+USE_PYTHON=	-2.7
+WANT_GNOME=	yes
+INSTALLS_EGGINFO=yes
 INSTALLS_ICONS=	yes
-INSTALLS_EGGINFO=	yes
 
-MAN1=		gpo.1 ${PORTNAME}.1 ${PORTNAME}-backup.1
+MAN1=		gpo.1 ${PORTNAME}.1
 
-MGC_DISTNAME=	mygpoclient-1.6
-MGC_WRKSRC=	${WRKDIR}/${MGC_DISTNAME}/mygpoclient
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_COVERART)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging
+.if defined(WITH_GTK)
+MAKE_ENV=	GPODDER_INSTALL_UIS="cli gtk"
+PLIST_SUB+=	GTK=""
+RUN_DEPENDS+=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
+		xdg-open:${PORTSDIR}/devel/xdg-utils
+USE_GNOME=	pygtk2
+.else
+PLIST_SUB+=	GTK="@comment "
 .endif
-
-.if defined(WITH_IPOD)
-LIB_DEPENDS+=	gpod.7:${PORTSDIR}/audio/libgpod
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}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
+.if defined(WITH_NOTIFY)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}notify>=0:${PORTSDIR}/devel/py-notify
 .endif
+.if defined(WITH_MUTAGEN)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mutagen>=0:${PORTSDIR}/audio/py-mutagen
 .endif
-
-.if defined(WITH_MP3TAG)
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}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
-
-# ensure that setup.py can find mygpoclient module when installing gpodder
-MAKE_ENV+=	PYTHONPATH="${PYTHONPREFIX_SITELIBDIR}"
-
-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} ${PYTHONPREFIX_SITELIBDIR}/mygpoclient
-	@(cd ${MGC_WRKSRC} && ${COPYTREE_SHARE} . ${PYTHONPREFIX_SITELIBDIR}/mygpoclient)
-
+post-install:
+.for man in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/share/man/man1/${man} ${MANPREFIX}/man/man1/${man}
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in PKG-INFO README
@@ -97,4 +72,4 @@ pre-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index 71b90c38195a..00f6b6090530 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,4 +1,2 @@
-SHA256 (gpodder-2.20.1.tar.gz) = 614c62cfe6a894b48db3274b6e8939b58581aed8b6b152421a0f6fec43f8d9fe
-SIZE (gpodder-2.20.1.tar.gz) = 1039975
-SHA256 (mygpoclient-1.6.tar.gz) = 0554bf1ab2fe4c6b7c3a7c1cdac7088be4427e77c4b63d797e722789d90c7cf7
-SIZE (mygpoclient-1.6.tar.gz) = 32203
+SHA256 (gpodder-3.1.1.tar.gz) = ac4041f3cde2dbe7ffe3b4773e9e79e8d4b663171f6af35a33504d80ad7f3608
+SIZE (gpodder-3.1.1.tar.gz) = 2055832
diff --git a/multimedia/gpodder/files/patch-setup.py b/multimedia/gpodder/files/patch-setup.py
new file mode 100644
index 000000000000..532044f42616
--- /dev/null
+++ b/multimedia/gpodder/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- ./setup.py.orig	2012-02-24 02:54:22.000000000 +0400
++++ ./setup.py	2012-05-01 11:53:17.000000000 +0400
+@@ -90,7 +90,7 @@
+                     return True
+ 
+                 basename, _ = os.path.splitext(filename)
+-                result = any(os.path.basename(s) == basename for s in scripts)
++                result = False
+                 if not result:
+                     info('Skipping manpage without script:', filename)
+                 return result
diff --git a/multimedia/gpodder/pkg-descr b/multimedia/gpodder/pkg-descr
index e61bdd2f841f..065a2e3a9232 100644
--- a/multimedia/gpodder/pkg-descr
+++ b/multimedia/gpodder/pkg-descr
@@ -1,7 +1,10 @@
-gPodder is a GTK2 media aggregator written in Python.  A user can
-subscribe to RSS feeds for podcasts, videocasts, and other similiar
-content and download media files found in those feeds.  gPodder also
-supports optional iPod synchronization support, MP3/OGG id3 tag
-editing, and Ogg-to-iPod synchronization.
+gPodder downloads and manages free audio and video content ("podcasts") for you.
+Listen directly on your computer or on your mobile devices.
 
-WWW:  http://gpodder.org
+  * Supports RSS, Atom, YouTube, Soundcloud, Vimeo and XSPF feeds
+  * Discover new content at our Podcast directory
+  * Synchronize between devices with full gpodder.net integration
+  * Easily customizable - support for user-defined hooks and plugins
+  * Open Source and Free Software (GPL v3 or later)
+
+WWW:	http://gpodder.org/
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index f044e8f16471..f6ffc0343c67 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -1,92 +1,82 @@
 bin/gpo
-bin/gpodder
-bin/gpodder-backup
+%%GTK%%bin/gpodder
+bin/gpodder-migrate2tres
 %%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/core.py
+%%PYTHON_SITELIBDIR%%/gpodder/core.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/coverart.py
+%%PYTHON_SITELIBDIR%%/gpodder/coverart.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/extensions.py
+%%PYTHON_SITELIBDIR%%/gpodder/extensions.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/feedcore.py
 %%PYTHON_SITELIBDIR%%/gpodder/feedcore.pyc
-%%PYTHON_SITELIBDIR%%/gpodder/gpodderosx.py
-%%PYTHON_SITELIBDIR%%/gpodder/gpodderosx.pyc
-%%PYTHON_SITELIBDIR%%/gpodder/gpopymtp.py
-%%PYTHON_SITELIBDIR%%/gpodder/gpopymtp.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/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/hooks.py
-%%PYTHON_SITELIBDIR%%/gpodder/hooks.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/feedservice.py
+%%PYTHON_SITELIBDIR%%/gpodder/feedservice.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/shownotes.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/shownotes.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/shownotes.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/shownotes.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyc
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.py
+%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/jsonconfig.py
+%%PYTHON_SITELIBDIR%%/gpodder/jsonconfig.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/log.py
+%%PYTHON_SITELIBDIR%%/gpodder/log.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/minidb.py
 %%PYTHON_SITELIBDIR%%/gpodder/minidb.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/model.py
@@ -97,114 +87,81 @@ bin/gpodder-backup
 %%PYTHON_SITELIBDIR%%/gpodder/opml.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/player.py
 %%PYTHON_SITELIBDIR%%/gpodder/player.pyc
-%%PYTHON_SITELIBDIR%%/gpodder/qtui.py
-%%PYTHON_SITELIBDIR%%/gpodder/qtui.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/gpodder/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/plugins/soundcloud.py
+%%PYTHON_SITELIBDIR%%/gpodder/plugins/soundcloud.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/plugins/xspf.py
+%%PYTHON_SITELIBDIR%%/gpodder/plugins/xspf.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/query.py
+%%PYTHON_SITELIBDIR%%/gpodder/query.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/schema.py
+%%PYTHON_SITELIBDIR%%/gpodder/schema.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/xspf.py
-%%PYTHON_SITELIBDIR%%/gpodder/xspf.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/vimeo.py
+%%PYTHON_SITELIBDIR%%/gpodder/vimeo.pyc
+%%PYTHON_SITELIBDIR%%/gpodder/webui/__init__.py
+%%PYTHON_SITELIBDIR%%/gpodder/webui/__init__.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/feeds.py
-%%PYTHON_SITELIBDIR%%/mygpoclient/feeds.pyc
-%%PYTHON_SITELIBDIR%%/mygpoclient/feeds.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
+%%GTK%%share/applications/gpodder.desktop
+%%GTK%%share/dbus-1/services/org.gpodder.service
 %%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%DATADIR%%/audio-locked.png
-%%DATADIR%%/audio.png
 %%DATADIR%%/credits.txt
-%%DATADIR%%/download.png
-%%DATADIR%%/folder.png
-%%DATADIR%%/ipod.png
-%%DATADIR%%/locked-overlay.png
-%%DATADIR%%/locked.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%%/video-locked.png
-%%DATADIR%%/video.png
-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
+%%DATADIR%%/examples/gpodder_mark_played.py
+%%DATADIR%%/examples/hello_world.py
+%%DATADIR%%/extensions/flv2mp4.py
+%%DATADIR%%/extensions/m4a_converter.py
+%%DATADIR%%/extensions/normalize_audio.py
+%%DATADIR%%/extensions/notification.py
+%%DATADIR%%/extensions/rename_download.py
+%%DATADIR%%/extensions/rm_ogg_cover.py
+%%DATADIR%%/extensions/rockbox_convert2mp4.py
+%%DATADIR%%/extensions/tagging.py
+%%DATADIR%%/extensions/ubuntu_appindicator.py
+%%DATADIR%%/extensions/ubuntu_unity.py
+%%DATADIR%%/extensions/woodchuck.py
+%%DATADIR%%/images/podcast-0.png
+%%DATADIR%%/images/podcast-1.png
+%%DATADIR%%/images/podcast-2.png
+%%DATADIR%%/images/podcast-3.png
+%%DATADIR%%/images/podcast-4.png
+%%DATADIR%%/images/podcast-all.png
+%%GTK%%%%DATADIR%%/ui/gtk/gpodder.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderaddpodcast.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderchannel.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderconfigeditor.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderepisodeselector.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderpodcastdirectory.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderpreferences.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpoddershownotes.ui
+%%GTK%%%%DATADIR%%/ui/gtk/gpodderwelcome.ui
+%%DATADIR%%/ui/web/gpodder.js
+%%DATADIR%%/ui/web/index.html
+%%DATADIR%%/ui/web/style.css
+%%GTK%%share/icons/hicolor/16x16/gpodder.png
+%%GTK%%share/icons/hicolor/22x22/gpodder.png
+%%GTK%%share/icons/hicolor/24x24/gpodder.png
+%%GTK%%share/icons/hicolor/26x26/gpodder.png
+%%GTK%%share/icons/hicolor/32x32/gpodder.png
+%%GTK%%share/icons/hicolor/40x40/gpodder.png
+%%GTK%%share/icons/hicolor/48x48/gpodder.png
+%%GTK%%share/icons/hicolor/64x64/gpodder.png
+%%GTK%%share/icons/hicolor/scalable/apps/gpodder.svg
 share/locale/cs/LC_MESSAGES/gpodder.mo
+share/locale/cs_CZ/LC_MESSAGES/gpodder.mo
 share/locale/da/LC_MESSAGES/gpodder.mo
 share/locale/de/LC_MESSAGES/gpodder.mo
 share/locale/el/LC_MESSAGES/gpodder.mo
 share/locale/es/LC_MESSAGES/gpodder.mo
 share/locale/es_ES/LC_MESSAGES/gpodder.mo
+share/locale/eu/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
@@ -221,17 +178,31 @@ share/locale/ro/LC_MESSAGES/gpodder.mo
 share/locale/ru/LC_MESSAGES/gpodder.mo
 share/locale/sv/LC_MESSAGES/gpodder.mo
 share/locale/tr/LC_MESSAGES/gpodder.mo
+share/locale/tr_TR/LC_MESSAGES/gpodder.mo
 share/locale/uk/LC_MESSAGES/gpodder.mo
-share/pixmaps/gpodder.png
+share/locale/zh_CN/LC_MESSAGES/gpodder.mo
+@dirrmtry share/locale/tr_TR/LC_MESSAGES
+@dirrmtry share/locale/tr_TR
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
-@dirrm %%DATADIR%%/ui/desktop
+@dirrmtry share/locale/cs_CZ/LC_MESSAGES
+@dirrmtry share/locale/cs_CZ
+@dirrm %%DATADIR%%/ui/web
+%%GTK%%@dirrm %%DATADIR%%/ui/gtk
 @dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/extensions
+@dirrm %%DATADIR%%/examples
 @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
+%%GTK%%@dirrmtry share/applications
+%%GTK%%@dirrmtry share/icons/hicolor
+%%GTK%%@dirrmtry share/icons/hicolor/26x26
+%%GTK%%@dirrmtry share/icons/hicolor/40x40
+%%GTK%%@dirrmtry share/icons
+@dirrm %%PYTHON_SITELIBDIR%%/gpodder/webui
+@dirrm %%PYTHON_SITELIBDIR%%/gpodder/plugins
+%%GTK%%@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface
+%%GTK%%@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop
+%%GTK%%@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui
 @dirrm %%PYTHON_SITELIBDIR%%/gpodder