diff --git a/sysutils/ranger/Makefile b/sysutils/ranger/Makefile
index e90bb584dc2..9a7de6f9791 100644
--- a/sysutils/ranger/Makefile
+++ b/sysutils/ranger/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2015/11/19 19:13:35 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2017/06/11 09:02:43 dcoppa Exp $
 
 COMMENT =	minimalistic console file manager
 
 MODPY_EGG_VERSION = 1.7.2
 DISTNAME =	ranger-${MODPY_EGG_VERSION}
+REVISION =	0
 
 CATEGORIES =	sysutils misc
 
@@ -22,6 +23,10 @@ RUN_DEPENDS =	archivers/libarchive \
 TEST_DEPENDS =	devel/gmake \
 		sysutils/ggrep
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/doc/ranger.1 \
+		${WRKSRC}/ranger/ext/img_display.py
+
 do-test:
 	cd ${WRKSRC}; PYTHON=${MODPY_BIN} gmake test
 
diff --git a/sysutils/ranger/patches/patch-doc_ranger_1 b/sysutils/ranger/patches/patch-doc_ranger_1
new file mode 100644
index 00000000000..a1c0aeba2c7
--- /dev/null
+++ b/sysutils/ranger/patches/patch-doc_ranger_1
@@ -0,0 +1,14 @@
+$OpenBSD: patch-doc_ranger_1,v 1.1 2017/06/11 09:02:43 dcoppa Exp $
+
+Index: doc/ranger.1
+--- doc/ranger.1.orig
++++ doc/ranger.1
+@@ -1329,7 +1329,7 @@ docstrings.  Using this will disable the <F1> key on c
+ .IP "W3MIMGDISPLAY_PATH" 8
+ .IX Item "W3MIMGDISPLAY_PATH"
+ By changing this variable, you can change the path of the executable file for
+-image previews.  By default, it is set to \fI/usr/lib/w3m/w3mimgdisplay\fR.
++image previews.  By default, it is set to \fI${LOCALBASE}/libexec/w3m/w3mimgdisplay\fR.
+ .SH "EXAMPLES"
+ .IX Header "EXAMPLES"
+ There are various examples on how to extend ranger with plugins or combine
diff --git a/sysutils/ranger/patches/patch-ranger_ext_img_display_py b/sysutils/ranger/patches/patch-ranger_ext_img_display_py
new file mode 100644
index 00000000000..bb33fb1037c
--- /dev/null
+++ b/sysutils/ranger/patches/patch-ranger_ext_img_display_py
@@ -0,0 +1,14 @@
+$OpenBSD: patch-ranger_ext_img_display_py,v 1.1 2017/06/11 09:02:43 dcoppa Exp $
+
+Index: ranger/ext/img_display.py
+--- ranger/ext/img_display.py.orig
++++ ranger/ext/img_display.py
+@@ -21,7 +21,7 @@ import termios
+ from ranger.core.shared import FileManagerAware
+ from subprocess import Popen, PIPE
+ 
+-W3MIMGDISPLAY_PATH = '/usr/lib/w3m/w3mimgdisplay'
++W3MIMGDISPLAY_PATH = '${LOCALBASE}/libexec/w3m/w3mimgdisplay'
+ W3MIMGDISPLAY_OPTIONS = []
+ 
+ class ImgDisplayUnsupportedException(Exception):