diff --git a/www/googler/Makefile b/www/googler/Makefile
index 1e364251005c..95bda9eecba6 100644
--- a/www/googler/Makefile
+++ b/www/googler/Makefile
@@ -1,34 +1,36 @@
 # Created by: Nicola Stanislao Vitale <nivit@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	googler
-PORTVERSION=	3.2
+PORTVERSION=	3.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Google Search, Google Site Search, Google News from the terminal
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+RUN_DEPENDS=	xclip:x11/xclip
+
 USES=		python:3.3+ shebangfix
 SHEBANG_FILES=	googler
 USE_GITHUB=	yes
 GH_ACCOUNT=	jarun
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/googler man/man1/googler.1.gz
 
 post-patch:
 	@${SED} -i.bak 's/^\(ENABLE_SELF_UPGRADE_MECHANISM=\)True$$/\1False/' \
 		${WRKSRC}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}/${MANPREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff --git a/www/googler/distinfo b/www/googler/distinfo
index 34e49d6b7944..6abd3983b5de 100644
--- a/www/googler/distinfo
+++ b/www/googler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1500360091
-SHA256 (jarun-googler-v3.2_GH0.tar.gz) = 62c43871e2095fc05a2b632173f3d80b952531dc7bb306b24dcacdbc0472ae5a
-SIZE (jarun-googler-v3.2_GH0.tar.gz) = 58102
+TIMESTAMP = 1534410147
+SHA256 (jarun-googler-v3.6_GH0.tar.gz) = 514218f5155a2c1bd653462a503507beafca9d7ddff7203aeabb3ab4812e4b44
+SIZE (jarun-googler-v3.6_GH0.tar.gz) = 71738
diff --git a/www/googler/files/patch-googler b/www/googler/files/patch-googler
new file mode 100644
index 000000000000..f3fb30163b58
--- /dev/null
+++ b/www/googler/files/patch-googler
@@ -0,0 +1,14 @@
+--- googler.orig	2018-05-23 03:22:46 UTC
++++ googler
+@@ -2083,9 +2083,9 @@ class GooglerCmd(object):
+                     try:
+                         # try copying the url to clipboard using native utilities
+                         if sys.platform.startswith(('linux', 'freebsd', 'openbsd')):
+-                            if shutil.which('xsel') is None:
++                            if shutil.which('xclip') is None:
+                                 raise FileNotFoundError
+-                            copier_params = ['xsel', '-b', '-i']
++                            copier_params = ['xclip', '-selection', 'clipboard']
+                         elif sys.platform == 'darwin':
+                             copier_params = ['pbcopy']
+                         elif sys.platform == 'win32':