diff --git a/www/e2guardian/Makefile b/www/e2guardian/Makefile
index ab796ddeb641..dba078c94ed0 100644
--- a/www/e2guardian/Makefile
+++ b/www/e2guardian/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	e2guardian
-PORTVERSION=	3.0.4
+PORTVERSION=	3.4.0.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	www
 
 MAINTAINER=	marcellocoutinho@gmail.com
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	rst2man:${PORTSDIR}/textproc/py-docutils
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_GITHUB=	yes
-USES=		iconv pkgconfig
+USES=		autoreconf libtool iconv pkgconfig
 USE_RC_SUBR=	e2guardian
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
@@ -92,6 +92,9 @@ post-extract:
 	@sleep 3
 .endif
 
+pre-configure:
+	@cd ${WRKSRC} && ${SH} ${WRKSRC}/autogen.sh
+
 post-install:
 	@${FIND} ${STAGEDIR}${ETCDIR} -type f \
 		\( -name '*.conf' -or -name '*list' \) -exec ${MV} {} {}.sample \;
diff --git a/www/e2guardian/distinfo b/www/e2guardian/distinfo
index e39e5b81860e..743fd0a01fb8 100644
--- a/www/e2guardian/distinfo
+++ b/www/e2guardian/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2guardian-e2guardian-v3.0.4_GH0.tar.gz) = 8817a0e95f38982520b87bb7cd7b34b7ab752f37bc2307065a82d59960b52530
-SIZE (e2guardian-e2guardian-v3.0.4_GH0.tar.gz) = 793490
+SHA256 (e2guardian-e2guardian-v3.4.0.1_GH0.tar.gz) = 0eaae1d9069ca1cf9436cb3318da321ab50107e8cc96f9f3d98417307dc608d1
+SIZE (e2guardian-e2guardian-v3.4.0.1_GH0.tar.gz) = 517052
diff --git a/www/e2guardian/files/e2guardian.in b/www/e2guardian/files/e2guardian.in
index 3e1f7acc9ff3..10695b87dfc8 100644
--- a/www/e2guardian/files/e2guardian.in
+++ b/www/e2guardian/files/e2guardian.in
@@ -27,8 +27,21 @@ load_rc_config $name
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/${name}.pid
+stop_postcmd="e2guardian_stop_postcmd"
+reload_cmd="e2guardian_reload_cmd"
+extra_commands="reload"
 
 command_args="-p $pidfile -f $e2guardian_config $e2guardian_flags"
 
-run_rc_command "$1"
+e2guardian_reload_cmd() {
+	if [ -f "${pidfile}" ]; then
+		${command} -g ${command_args}
+		echo "Reloading ${name}."
+	fi
+}
 
+e2guardian_stop_postcmd() {
+	rm ${pidfile}
+}
+
+run_rc_command "$1"
diff --git a/www/e2guardian/pkg-plist b/www/e2guardian/pkg-plist
index 343822adffa5..f63fc33d7ad7 100644
--- a/www/e2guardian/pkg-plist
+++ b/www/e2guardian/pkg-plist
@@ -14,7 +14,6 @@
 @sample %%ETCDIR%%/downloadmanagers/fancy.conf.sample
 @sample %%ETCDIR%%/e2guardian.conf.sample
 @sample %%ETCDIR%%/e2guardianf1.conf.sample
-%%ETCDIR%%/installation_or_migration_from_dg.sh
 @sample %%ETCDIR%%/lists/addheaderregexplist.sample
 %%DNS%%@sample %%ETCDIR%%/lists/authexceptionsitelist.sample
 %%DNS%%@sample %%ETCDIR%%/lists/authexceptionurllist.sample
@@ -31,8 +30,6 @@
 @sample %%ETCDIR%%/lists/bannedsitelist.sample
 @sample %%ETCDIR%%/lists/bannedsslsitelist.sample
 @sample %%ETCDIR%%/lists/bannedurllist.sample
-%%ETCDIR%%/lists/blacklists/ads/domains
-%%ETCDIR%%/lists/blacklists/ads/urls
 @sample %%ETCDIR%%/lists/contentregexplist.sample
 %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusextensionlist.sample
 %%SCANNERS%%@sample %%ETCDIR%%/lists/contentscanners/exceptionvirusmimetypelist.sample
@@ -68,6 +65,7 @@
 @sample %%ETCDIR%%/lists/logregexpurllist.sample
 @sample %%ETCDIR%%/lists/logsitelist.sample
 @sample %%ETCDIR%%/lists/logurllist.sample
+@sample %%ETCDIR%%/lists/nocheckcertsitelist.sample
 %%ETCDIR%%/lists/phraselists/badwords/weighted_dutch
 %%ETCDIR%%/lists/phraselists/badwords/weighted_french
 %%ETCDIR%%/lists/phraselists/badwords/weighted_german
@@ -243,6 +241,7 @@ sbin/e2guardian
 %%DATADIR%%/languages/ukenglish/template.html
 %%DATADIR%%/scripts/bsd-init
 %%DATADIR%%/scripts/e2guardian
+%%DATADIR%%/scripts/e2guardian.service
 %%DATADIR%%/scripts/logrotation
 %%DATADIR%%/scripts/solaris-init
 %%DATADIR%%/scripts/systemv-init