diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 1ce2eac9dfc7..c97e3e4390bc 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,56 +1,54 @@
 # Created by: Jeremy Norris <ishmael127@home.com>
 
 PORTNAME=	feh
-PORTVERSION=	3.8
-PORTREVISION=	1
+PORTVERSION=	3.9
 CATEGORIES=	graphics
-MASTER_SITES=	http://feh.finalrewind.org/ \
-		LOCAL/uqs
+MASTER_SITES=	https://feh.finalrewind.org/
 
 MAINTAINER=	dmenelkir@gmail.com
 COMMENT=	Image viewer that utilizes Imlib2
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2 \
 		libpng.so:graphics/png
 
 USES=		compiler:c++11-lang cpe desktop-file-utils gmake localbase:ldflags \
 		tar:bzip2 xorg
 USE_XORG=	x11 xt xinerama
 CPE_VENDOR=	feh_project
 
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}" verscmp=0
 
 OPTIONS_DEFINE=	CURL DCRAW DOCS EXAMPLES EXIF XINERAMA
 EXIF_DESC=	Support EXIF tags
 DCRAW_DESC=	Use dcraw to display raw file previews
 OPTIONS_DEFAULT=CURL EXIF XINERAMA
 OPTIONS_SUB=	yes
 
 EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 EXIF_MAKE_ENV=		exif=1
 EXIF_MAKE_ENV_OFF=	exif=0
 
 XINERAMA_MAKE_ENV=	xinerama=1
 XINERAMA_MAKE_ENV_OFF=	xinerama=0
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_MAKE_ENV=		curl=1
 CURL_MAKE_ENV_OFF=	curl=0
 
 DCRAW_RUN_DEPENDS=	dcraw:graphics/dcraw
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|install-doc||' \
 		${WRKSRC}/Makefile
 
 post-patch-EXAMPLES-off:
 	@${REINPLACE_CMD} -e 's|install-examples||' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/feh
 
 .include <bsd.port.mk>
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 494d5050eb77..b1cc0c186c30 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651623741
-SHA256 (feh-3.8.tar.bz2) = 7f3c34552b39336d7ebee2d7c4bf5697aaaa2c6c102c357f6e82ea240bd62ba9
-SIZE (feh-3.8.tar.bz2) = 2122631
+TIMESTAMP = 1655359245
+SHA256 (feh-3.9.tar.bz2) = 8649962c41d2c7ec4cc3f438eb327638a1820ad5a66df6a9995964601ae6bca0
+SIZE (feh-3.9.tar.bz2) = 2111997
diff --git a/graphics/feh/files/patch-config.mk b/graphics/feh/files/patch-config.mk
index b67a4f9cf1c3..2ede77fe5491 100644
--- a/graphics/feh/files/patch-config.mk
+++ b/graphics/feh/files/patch-config.mk
@@ -1,12 +1,11 @@
-s--- config.mk.orig	2017-12-28 18:28:35 UT2
---- config.mk.orig	2022-01-03 10:34:57 UTC
+--- config.mk.orig	2022-06-16 06:01:30 UTC
 +++ config.mk
-@@ -28,7 +28,7 @@ font_dir = ${main_dir}/share/feh/fonts
+@@ -29,7 +29,7 @@ bin_dir = ${main_dir}/bin
  doc_dir = ${main_dir}/share/doc/feh
  image_dir = ${main_dir}/share/feh/images
  font_dir = ${main_dir}/share/feh/fonts
 -example_dir = ${main_dir}/share/doc/feh/examples
 +example_dir = ${main_dir}/share/examples/feh
  desktop_dir = ${main_dir}/share/applications
  icon_dir = ${ICON_PREFIX}/hicolor
  48_icon_dir = ${icon_dir}/48x48/apps
diff --git a/graphics/feh/files/patch-src_Makefile b/graphics/feh/files/patch-src_Makefile
deleted file mode 100644
index 38111a691727..000000000000
--- a/graphics/feh/files/patch-src_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2017-12-28 18:28:35 UTC
-+++ src/Makefile
-@@ -5,8 +5,6 @@ TARGETS = \
- 	events.c \
- 	feh_png.c \
- 	filelist.c \
--	getopt.c \
--	getopt1.c \
- 	gib_hash.c \
- 	gib_imlib.c \
- 	gib_list.c \