diff --git a/www/qupzilla/Makefile b/www/qupzilla/Makefile
index c5d240fbcf9e..f0469943f98b 100644
--- a/www/qupzilla/Makefile
+++ b/www/qupzilla/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	qupzilla
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.5
 CATEGORIES=	www
-MASTER_SITES=	http://www.qupzilla.com/uploads/
+MASTER_SITES=	https://github.com/QupZilla/${PORTNAME}/releases/download/v${PORTVERSION}/
 DISTNAME=	QupZilla-${PORTVERSION}
 
 MAINTAINER=	javad.kouhi@gmail.com
@@ -14,13 +14,28 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 
-USES=		desktop-file-utils pkgconfig qmake
+USES=		desktop-file-utils pkgconfig qmake tar:xz
 USE_QT4=	gui moc_build rcc_build uic_build webkit \
 		dbus xml script sql network imageformats_run linguist_build
 QMAKE_ENV=	QUPZILLA_PREFIX=${PREFIX}/
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
+OPTIONS_DEFINE=	GNOMEKEYRING KWALLET
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGNOMEKEYRING}
+LIB_DEPENDS+=	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+QMAKE_ENV+=	GNOME_INTEGRATION="true"
+.endif
+
+.if ${PORT_OPTIONS:MKWALLET}
+LIB_DEPENDS+=	libkdeui.so:${PORTSDIR}/x11/kdelibs4
+QMAKE_ENV+=	KDE_INTEGRATION="true"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/tests/autotests/qztoolstest.cpp \
diff --git a/www/qupzilla/distinfo b/www/qupzilla/distinfo
index 766009181e8c..04627146864e 100644
--- a/www/qupzilla/distinfo
+++ b/www/qupzilla/distinfo
@@ -1,2 +1,2 @@
-SHA256 (QupZilla-1.6.3.tar.gz) = ba69b4bb9f9644fcff5945a0b692e6db877e57c2b9d948a7f57ecfcd4a86f7a0
-SIZE (QupZilla-1.6.3.tar.gz) = 5087827
+SHA256 (QupZilla-1.6.5.tar.xz) = 4ba1a2ab7fcb2c2b3230d202b78ae8ee6d6ec917bb2284c57c4dde54ca951715
+SIZE (QupZilla-1.6.5.tar.xz) = 3153012
diff --git a/www/qupzilla/pkg-plist b/www/qupzilla/pkg-plist
index 45192c37e36e..1f8d5be14e46 100644
--- a/www/qupzilla/pkg-plist
+++ b/www/qupzilla/pkg-plist
@@ -2,9 +2,11 @@ bin/qupzilla
 lib/libQupZilla.so
 lib/libQupZilla.so.1
 lib/libQupZilla.so.1.6
-lib/libQupZilla.so.1.6.3
+lib/libQupZilla.so.1.6.5
 lib/qupzilla/libAccessKeysNavigation.so
+%%GNOMEKEYRING%%lib/qupzilla/libGnomeKeyringPasswords.so
 lib/qupzilla/libGreaseMonkey.so
+%%KWALLET%%lib/qupzilla/libKWalletPasswords.so
 lib/qupzilla/libMouseGestures.so
 lib/qupzilla/libPIM.so
 lib/qupzilla/libStatusBarIcons.so
@@ -24,7 +26,9 @@ share/pixmaps/qupzilla.png
 %%DATADIR%%/locale/de_DE.qm
 %%DATADIR%%/locale/el_GR.qm
 %%DATADIR%%/locale/es_ES.qm
+%%DATADIR%%/locale/es_MX.qm
 %%DATADIR%%/locale/es_VE.qm
+%%DATADIR%%/locale/eu_ES.qm
 %%DATADIR%%/locale/fa_IR.qm
 %%DATADIR%%/locale/fr_FR.qm
 %%DATADIR%%/locale/gl_ES.qm
@@ -35,6 +39,7 @@ share/pixmaps/qupzilla.png
 %%DATADIR%%/locale/ja_JP.qm
 %%DATADIR%%/locale/ka_GE.qm
 %%DATADIR%%/locale/lg.qm
+%%DATADIR%%/locale/lv_LV.qm
 %%DATADIR%%/locale/nl_NL.qm
 %%DATADIR%%/locale/nqo.qm
 %%DATADIR%%/locale/pl_PL.qm
@@ -77,6 +82,7 @@ share/pixmaps/qupzilla.png
 %%DATADIR%%/locale/sr_RS@latin.qm
 %%DATADIR%%/locale/sv_SE.qm
 %%DATADIR%%/locale/uk_UA.qm
+%%DATADIR%%/locale/uz@Latn.qm
 %%DATADIR%%/locale/zh_CN.qm
 %%DATADIR%%/locale/zh_TW.qm
 %%DATADIR%%/themes/chrome/images/blankbutton-a.png