Index: head/sysutils/nitrogen/Makefile
===================================================================
--- head/sysutils/nitrogen/Makefile	(revision 487051)
+++ head/sysutils/nitrogen/Makefile	(revision 487052)
@@ -1,50 +1,43 @@
 # Created by: Jonathan Liu <Net147@hotmail.com>
 # $FreeBSD$
 
 PORTNAME=	nitrogen
-PORTVERSION=	1.5.2
-PORTREVISION=	9
+DISTVERSION=	1.6.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://projects.l3ib.org/nitrogen/files/
+MASTER_SITES=	https://github.com/l3ib/nitrogen/releases/download/${DISTVERSION}/
 
-MAINTAINER=	corentin@ralite.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Background browser and setter for X windows
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 RUN_DEPENDS=	gnome-icon-theme>0:misc/gnome-icon-theme \
 		hicolor-icon-theme>0:misc/hicolor-icon-theme
 
-OPTIONS_DEFINE=	XINERAMA
-OPTIONS_DEFAULT=XINERAMA
-
-USES=		compiler:c++11-lang gettext iconv pkgconfig
+USES=		compiler:c++11-lang gettext gmake gnome iconv localbase pkgconfig
 USE_CXXSTD=	c++11
 USE_GNOME=	gtkmm24
+INSTALLS_ICONS=	yes
 USE_XORG=	x11
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-inotify
-INSTALLS_ICONS=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lX11
+LIBS+=		-lX11
 
-DESKTOP_ENTRIES="Nitrogen" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \
-		"Graphics;Viewer;" true
+OPTIONS_DEFINE=		XINERAMA
+OPTIONS_DEFAULT=	XINERAMA
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+=	xinerama
-CONFIGURE_ARGS+=--enable-xinerama
-.else
-CONFIGURE_ARGS+=--disable-xinerama
-.endif
+XINERAMA_CONFIGURE_ENABLE=	xinerama
+XINERAMA_USE=			xorg=xinerama
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/data/icon-theme-installer
 	@${REINPLACE_CMD} '/^LIBS =/s/$$/ @LIBS@/' ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
Index: head/sysutils/nitrogen/distinfo
===================================================================
--- head/sysutils/nitrogen/distinfo	(revision 487051)
+++ head/sysutils/nitrogen/distinfo	(revision 487052)
@@ -1,2 +1,3 @@
-SHA256 (nitrogen-1.5.2.tar.gz) = 60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2
-SIZE (nitrogen-1.5.2.tar.gz) = 307356
+TIMESTAMP = 1544343577
+SHA256 (nitrogen-1.6.1.tar.gz) = f40213707b7a3be87e556f65521cef8795bd91afda13dfac8f00c3550375837d
+SIZE (nitrogen-1.6.1.tar.gz) = 314332
Index: head/sysutils/nitrogen/pkg-descr
===================================================================
--- head/sysutils/nitrogen/pkg-descr	(revision 487051)
+++ head/sysutils/nitrogen/pkg-descr	(revision 487052)
@@ -1,4 +1,4 @@
 Nitrogen is a background browser and setter for X windows. It is written
 in C++ using the gtkmm toolkit.
 
-WWW: http://projects.l3ib.org/nitrogen
+WWW: https://github.com/l3ib/nitrogen
Index: head/sysutils/nitrogen/pkg-plist
===================================================================
--- head/sysutils/nitrogen/pkg-plist	(revision 487051)
+++ head/sysutils/nitrogen/pkg-plist	(revision 487052)
@@ -1,13 +1,21 @@
 bin/nitrogen
 man/man1/nitrogen.1.gz
+share/appdata/nitrogen.appdata.xml
+share/applications/nitrogen.desktop
 share/icons/hicolor/128x128/apps/nitrogen.png
 share/icons/hicolor/16x16/actions/wallpaper-centered.png
 share/icons/hicolor/16x16/actions/wallpaper-scaled.png
 share/icons/hicolor/16x16/actions/wallpaper-tiled.png
 share/icons/hicolor/16x16/actions/wallpaper-zoomed.png
 share/icons/hicolor/16x16/apps/nitrogen.png
 share/icons/hicolor/16x16/devices/video-display.png
 share/icons/hicolor/16x16/mimetypes/image-x-generic.png
 share/icons/hicolor/22x22/apps/nitrogen.png
 share/icons/hicolor/32x32/apps/nitrogen.png
 share/icons/hicolor/48x48/apps/nitrogen.png
+share/locale/bs/LC_MESSAGES/nitrogen.mo
+share/locale/fi/LC_MESSAGES/nitrogen.mo
+share/locale/hr/LC_MESSAGES/nitrogen.mo
+share/locale/pl/LC_MESSAGES/nitrogen.mo
+share/locale/ru/LC_MESSAGES/nitrogen.mo
+share/locale/sr/LC_MESSAGES/nitrogen.mo