diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index eef6faef82b1..dd1e26230d67 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -6,21 +6,31 @@
 #
 
 PORTNAME=	ristretto
-PORTVERSION=	0.0.22
-PORTREVISION=	5
+PORTVERSION=	0.0.91
 CATEGORIES=	graphics xfce
-MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	An image-viewer with xfce-integration
 
-LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		cairo.2:${PORTSDIR}/graphics/cairo
 
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gtk20 glib20 intltool intlhack desktopfileutils pkgconfig
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
-USE_XFCE=	configenv libutil thunar
+USE_XFCE=	configenv libutil libgui xfconf
+
+post-patch:
+	@${REINPLACE_CMD} -e 's| docs||' ${WRKSRC}/Makefile.in
+
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/graphics/ristretto/distinfo b/graphics/ristretto/distinfo
index 1867fa392432..db5636938921 100644
--- a/graphics/ristretto/distinfo
+++ b/graphics/ristretto/distinfo
@@ -1,3 +1,3 @@
-MD5 (ristretto-0.0.22.tar.gz) = 978ae19472c5a0b7d4b6622a68234a67
-SHA256 (ristretto-0.0.22.tar.gz) = 73af9e0b0d2d70a1c4a784e8313f36d94d2def9f247aa701f12ee483aea90d8b
-SIZE (ristretto-0.0.22.tar.gz) = 232160
+MD5 (xfce4/ristretto-0.0.91.tar.bz2) = 1df541b920f044ac9f3731b2a0fe02d1
+SHA256 (xfce4/ristretto-0.0.91.tar.bz2) = fcff7e8898594553d60d5d1c9d2cdbebc540db1384ab1ee60010bdc839abdd2c
+SIZE (xfce4/ristretto-0.0.91.tar.bz2) = 244266
diff --git a/graphics/ristretto/pkg-plist b/graphics/ristretto/pkg-plist
index bb9d914c826d..fc019d19de99 100644
--- a/graphics/ristretto/pkg-plist
+++ b/graphics/ristretto/pkg-plist
@@ -8,6 +8,7 @@ share/icons/hicolor/36x36/apps/ristretto.png
 share/icons/hicolor/48x48/apps/ristretto.png
 share/icons/hicolor/scalable/apps/ristretto.svg
 share/locale/ar/LC_MESSAGES/ristretto.mo
+share/locale/ast/LC_MESSAGES/ristretto.mo
 share/locale/bg/LC_MESSAGES/ristretto.mo
 share/locale/ca/LC_MESSAGES/ristretto.mo
 share/locale/cs/LC_MESSAGES/ristretto.mo
@@ -36,9 +37,71 @@ share/locale/sv/LC_MESSAGES/ristretto.mo
 share/locale/tr/LC_MESSAGES/ristretto.mo
 share/locale/uk/LC_MESSAGES/ristretto.mo
 share/locale/ur/LC_MESSAGES/ristretto.mo
+share/locale/ur_PK/LC_MESSAGES/ristretto.mo
 share/locale/zh_CN/LC_MESSAGES/ristretto.mo
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
-@dirrmtry share/applications
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/tr/LC_MESSAGES
+@dirrmtry share/locale/tr
+@dirrmtry share/locale/sv/LC_MESSAGES
+@dirrmtry share/locale/sv
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ru/LC_MESSAGES
+@dirrmtry share/locale/ru
+@dirrmtry share/locale/pt_BR/LC_MESSAGES
+@dirrmtry share/locale/pt_BR
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nl/LC_MESSAGES
+@dirrmtry share/locale/nl
+@dirrmtry share/locale/nb/LC_MESSAGES
+@dirrmtry share/locale/nb
+@dirrmtry share/locale/lv/LC_MESSAGES
+@dirrmtry share/locale/lv
+@dirrmtry share/locale/ja/LC_MESSAGES
+@dirrmtry share/locale/ja
+@dirrmtry share/locale/it/LC_MESSAGES
+@dirrmtry share/locale/it
+@dirrmtry share/locale/id/LC_MESSAGES
+@dirrmtry share/locale/id
+@dirrmtry share/locale/hu/LC_MESSAGES
+@dirrmtry share/locale/hu
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fr/LC_MESSAGES
+@dirrmtry share/locale/fr
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/eu/LC_MESSAGES
+@dirrmtry share/locale/eu
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
+@dirrmtry share/locale/en_GB/LC_MESSAGES
+@dirrmtry share/locale/en_GB
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/de/LC_MESSAGES
+@dirrmtry share/locale/de
+@dirrmtry share/locale/da/LC_MESSAGES
+@dirrmtry share/locale/da
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bg/LC_MESSAGES
+@dirrmtry share/locale/bg
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/ar/LC_MESSAGES
+@dirrmtry share/locale/ar
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true