diff --git a/www/googler/Makefile b/www/googler/Makefile
index 8353ebe1b210..77cc2424b1de 100644
--- a/www/googler/Makefile
+++ b/www/googler/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	googler
-PORTVERSION=	3.9
+PORTVERSION=	4.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
 CATEGORIES=	www
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -14,8 +13,10 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	xclip:x11/xclip
+TEST_DEPENDS=	bash:shells/bash \
+		gshuf:sysutils/coreutils
 
-USES=		python:3.3+ shebangfix
+USES=		python:3.5+ shebangfix
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	jarun
@@ -27,12 +28,19 @@ PLIST_FILES=	bin/googler man/man1/googler.1.gz
 
 SHEBANG_FILES=	googler
 
+USE_LOCALE?=	en_US.UTF-8
+
 post-patch:
 	@${SED} -i.bak 's/^\(ENABLE_SELF_UPGRADE_MECHANISM = \)True$$/\1False/' \
 		${WRKSRC}/${PORTNAME}
+	@${REINPLACE_CMD} -e 's/shuf/gshuf/' ${WRKSRC}/tests/test
+	@${REINPLACE_CMD} -e 's/python3/${PYTHON_VERSION}/' ${WRKSRC}/tests/test
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${MANPREFIX}/man/man1/
 
+do-test:
+	@${SETENV} LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} ${WRKSRC}/tests/test --ci
+
 .include <bsd.port.mk>
diff --git a/www/googler/distinfo b/www/googler/distinfo
index b2e81679a897..488799786e86 100644
--- a/www/googler/distinfo
+++ b/www/googler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569254909
-SHA256 (jarun-googler-v3.9_GH0.tar.gz) = b90c6d28ad6ce0a2a2320806ab2133857fe1a0b6ca2a489d8eda1b8062e620e2
-SIZE (jarun-googler-v3.9_GH0.tar.gz) = 76432
+TIMESTAMP = 1575568042
+SHA256 (jarun-googler-v4.0_GH0.tar.gz) = f72593ca2a3dccd7301c0fed55effd223cc38f6c21910bffbbfba1360c985cd3
+SIZE (jarun-googler-v4.0_GH0.tar.gz) = 77873