diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile
index 47445db33a6b..bf500142986a 100644
--- a/graphics/imv/Makefile
+++ b/graphics/imv/Makefile
@@ -1,39 +1,65 @@
 # Created by: Tobias Kortkamp <t@tobik.me>
 # $FreeBSD$
 
 PORTNAME=	imv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.0
+DISTVERSION=	3.1.1
 CATEGORIES=	graphics
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Simple image viewer
 
-LICENSE=	GPLv2
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	asciidoc:textproc/asciidoc
-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-		libfreeimage.so:graphics/freeimage \
-		librsvg-2.so:graphics/librsvg2
+BUILD_DEPENDS=	a2x:textproc/asciidoc
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
 TEST_DEPENDS=	${LOCALBASE}/lib/libcmocka.so:sysutils/cmocka
 
-USES=		desktop-file-utils gmake gnome \
-		localbase pkgconfig sdl
-USE_SDL=	sdl2 ttf2
-USE_GNOME=	glib20
-
+USES=		desktop-file-utils gmake pkgconfig sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	eXeC64
+USE_SDL=	sdl2 ttf2
 
-ALL_TARGET=	imv
+MAKE_ARGS=	CONFIGPREFIX=${PREFIX}/etc \
+		INSTALL_DATA="${INSTALL_DATA}" \
+		INSTALL_MAN="${INSTALL_MAN}" \
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
+		MANPREFIX=${PREFIX}/man \
+		V=1
+ALL_TARGET=	imv doc
 TEST_TARGET=	check
 
-MAKE_ARGS=	V=1
-
 PLIST_FILES=	bin/imv \
 		etc/imv_config \
 		man/man1/imv.1.gz \
 		man/man5/imv.5.gz \
 		share/applications/imv.desktop
 
+OPTIONS_DEFINE=		FREEIMAGE JPEG PNG SVG TIFF
+OPTIONS_DEFAULT=	FREEIMAGE SVG
+
+FREEIMAGE_DESC=	FreeImage backend (support for many image formats)
+
+FREEIMAGE_LIB_DEPENDS=		libfreeimage.so:graphics/freeimage
+FREEIMAGE_MAKE_ARGS_OFF=	BACKEND_FREEIMAGE=no
+FREEIMAGE_MAKE_ARGS=		BACKEND_FREEIMAGE=yes
+
+JPEG_LIB_DEPENDS=	libturbojpeg.so:graphics/libjpeg-turbo
+JPEG_MAKE_ARGS_OFF=	BACKEND_LIBJPEG=no
+JPEG_MAKE_ARGS=		BACKEND_LIBJPEG=yes
+
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_MAKE_ARGS_OFF=	BACKEND_LIBPNG=no
+PNG_MAKE_ARGS=		BACKEND_LIBPNG=yes
+
+SVG_USES=		gnome
+SVG_USE=		GNOME=cairo,librsvg2
+SVG_MAKE_ARGS_OFF=	BACKEND_LIBRSVG=no
+SVG_MAKE_ARGS=		BACKEND_LIBRSVG=yes
+
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_MAKE_ARGS_OFF=	BACKEND_LIBTIFF=no
+TIFF_MAKE_ARGS=		BACKEND_LIBTIFF=yes
+
 .include <bsd.port.mk>
diff --git a/graphics/imv/distinfo b/graphics/imv/distinfo
index 229dfd1643be..f7147ff72fda 100644
--- a/graphics/imv/distinfo
+++ b/graphics/imv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560875164
-SHA256 (eXeC64-imv-v3.1.0_GH0.tar.gz) = d03ecd73221b77a4ae08c9625499d84525f0ec31113691367fb727d4c0ba1db8
-SIZE (eXeC64-imv-v3.1.0_GH0.tar.gz) = 45118
+TIMESTAMP = 1561235978
+SHA256 (eXeC64-imv-v3.1.1_GH0.tar.gz) = e6eca0c9f341ebb68444d12576291e5bcdeb31d5fb34da98fdb1e29ba16a7e15
+SIZE (eXeC64-imv-v3.1.1_GH0.tar.gz) = 45184
diff --git a/graphics/imv/files/patch-Makefile b/graphics/imv/files/patch-Makefile
deleted file mode 100644
index a4c0131f0a58..000000000000
--- a/graphics/imv/files/patch-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- Makefile.orig	2018-05-08 20:17:30 UTC
-+++ Makefile
-@@ -2,9 +2,9 @@
- 
- PREFIX ?= /usr
- BINPREFIX ?= $(PREFIX)/bin
--MANPREFIX ?= $(PREFIX)/share/man
-+MANPREFIX ?= $(PREFIX)/man
- DATAPREFIX ?= $(PREFIX)/share
--CONFIGPREFIX ?= /etc
-+CONFIGPREFIX ?= $(PREFIX)/etc
- 
- CFLAGS ?= -W -Wall -pedantic -Wmissing-prototypes
- CFLAGS += -std=c99
-@@ -56,11 +56,11 @@ doc/%: doc/%.txt
- 	a2x --no-xmllint --doctype manpage --format manpage $<
- 
- install: $(TARGET) doc
--	install -D -m 0755 $(TARGET) $(DESTDIR)$(BINPREFIX)/imv
--	install -D -m 0644 doc/imv.1 $(DESTDIR)$(MANPREFIX)/man1/imv.1
--	install -D -m 0644 doc/imv.5 $(DESTDIR)$(MANPREFIX)/man5/imv.5
--	install -D -m 0644 files/imv.desktop $(DESTDIR)$(DATAPREFIX)/applications/imv.desktop
--	install -D -m 0644 files/imv_config $(DESTDIR)$(CONFIGPREFIX)/imv_config
-+	install -m 0755 $(TARGET) $(DESTDIR)$(BINPREFIX)/imv
-+	install -m 0644 doc/imv.1 $(DESTDIR)$(MANPREFIX)/man/man1/imv.1
-+	install -m 0644 doc/imv.5 $(DESTDIR)$(MANPREFIX)/man/man5/imv.5
-+	install -m 0644 files/imv.desktop $(DESTDIR)$(DATAPREFIX)/applications/imv.desktop
-+	install -m 0644 files/imv_config $(DESTDIR)$(CONFIGPREFIX)/imv_config
- 
- uninstall:
- 	$(RM) $(DESTDIR)$(BINPREFIX)/imv