diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 3948b6327120..88f68f5d9612 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2018/07/20 03:34:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2018/07/31 12:27:02 fhajny Exp $
 
-DISTNAME=	rspamd-1.7.4
-PKGREVISION=	1
+DISTNAME=	rspamd-1.7.8
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
 
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index 52b2954a0eca..ae06dec7fa30 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2018/05/16 16:49:44 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.13 2018/07/31 12:27:02 fhajny Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -12,6 +12,7 @@ man/man1/rspamc.1
 man/man8/rspamd.8
 share/examples/rspamd/2tld.inc
 share/examples/rspamd/actions.conf
+share/examples/rspamd/cgp.inc
 share/examples/rspamd/common.conf
 share/examples/rspamd/composites.conf
 share/examples/rspamd/dmarc_whitelist.inc
@@ -150,6 +151,8 @@ share/rspamd/languages/ur.json
 share/rspamd/languages/vi.json
 share/rspamd/languages/yi.json
 share/rspamd/languages/zh-CN.json
+share/rspamd/lib/ansicolors.lua
+share/rspamd/lib/argparse.lua
 share/rspamd/lib/fun.lua
 share/rspamd/lib/global_functions.lua
 share/rspamd/lib/lua_auth_results.lua
@@ -162,17 +165,17 @@ share/rspamd/lib/lua_redis.lua
 share/rspamd/lib/lua_squeeze_rules.lua
 share/rspamd/lib/lua_stat.lua
 share/rspamd/lib/lua_util.lua
-share/rspamd/lib/rspamadm/ansicolors.lua
+share/rspamd/lib/plugins_stats.lua
+share/rspamd/lib/rescore_utility.lua
 share/rspamd/lib/rspamadm/confighelp.lua
 share/rspamd/lib/rspamadm/configwizard.lua
 share/rspamd/lib/rspamadm/corpus_test.lua
 share/rspamd/lib/rspamadm/fuzzy_convert.lua
 share/rspamd/lib/rspamadm/fuzzy_stat.lua
-share/rspamd/lib/rspamadm/getopt.lua
 share/rspamd/lib/rspamadm/grep.lua
-share/rspamd/lib/rspamadm/plugins_stats.lua
+share/rspamd/lib/rspamadm/keypair.lua
+share/rspamd/lib/rspamadm/mime.lua
 share/rspamd/lib/rspamadm/rescore.lua
-share/rspamd/lib/rspamadm/rescore_utility.lua
 share/rspamd/lib/rspamadm/stat_convert.lua
 share/rspamd/lua/antivirus.lua
 share/rspamd/lua/arc.lua
@@ -258,9 +261,9 @@ share/rspamd/www/js/lib/domReady.js
 share/rspamd/www/js/lib/footable.min.js
 share/rspamd/www/js/lib/humanize.min.js
 share/rspamd/www/js/lib/jquery-3.3.1.min.js
+share/rspamd/www/js/lib/require.min.js
 share/rspamd/www/js/lib/visibility.min.js
 share/rspamd/www/js/main.js
-share/rspamd/www/js/require.js
 share/rspamd/www/plugins.txt
 share/rspamd/www/react-index.html
 @pkgdir etc/rspamd
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 30f2465e105a..3650a4dd75aa 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.24 2018/05/16 16:49:44 fhajny Exp $
+$NetBSD: distinfo,v 1.25 2018/07/31 12:27:02 fhajny Exp $
 
-SHA1 (rspamd-1.7.4.tar.gz) = 6087573227f7a737e69ae854d879b251631720fa
-RMD160 (rspamd-1.7.4.tar.gz) = 931514920f052b251713a5539e87abc19caa7fbe
-SHA512 (rspamd-1.7.4.tar.gz) = 625f7bffe75e81866f5eefabab4fb41bddb823397f6a930ab4c452e2219b4a33a5c4e1628a72551f55452a05c82c7c20d7be2097db9d59a68e66f6d348279191
-Size (rspamd-1.7.4.tar.gz) = 4485331 bytes
+SHA1 (rspamd-1.7.8.tar.gz) = 8213d37209d0050d7f94eb26ad22ca85455913df
+RMD160 (rspamd-1.7.8.tar.gz) = 13de5b2fe6b8349b7731991787d5be1b111ad1d9
+SHA512 (rspamd-1.7.8.tar.gz) = 43f2350dfa4e0369cd53480bd4c8d0aa3898d7c471540281e7460a264207032aea226c4fd519a26397b9e9e8c8de3951e5a9752e010eabf1b3733a0c3e3086c2
+Size (rspamd-1.7.8.tar.gz) = 4542955 bytes
 SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad
-SHA1 (patch-contrib_t1ha_t1ha__bits.h) = 79255739468384adb099b1e7a0ae41549151e660
 SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
diff --git a/mail/rspamd/patches/patch-contrib_t1ha_t1ha__bits.h b/mail/rspamd/patches/patch-contrib_t1ha_t1ha__bits.h
deleted file mode 100644
index 72bf91248182..000000000000
--- a/mail/rspamd/patches/patch-contrib_t1ha_t1ha__bits.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-contrib_t1ha_t1ha__bits.h,v 1.1 2018/05/16 16:49:44 fhajny Exp $
-
-Backport SunOS fix.
-
-https://github.com/vstakhov/rspamd/commit/7f596814c14a5844d49c50cad68df568e6417793
-
---- contrib/t1ha/t1ha_bits.h.orig	2018-05-01 15:52:02.000000000 +0000
-+++ contrib/t1ha/t1ha_bits.h
-@@ -390,7 +390,7 @@ static __always_inline uint16_t fetch16_
- #endif /* fetch16_le */
- 
- #if T1HA_USE_FAST_ONESHOT_READ && UNALIGNED_OK && defined(PAGESIZE) &&         \
--    PAGESIZE > 0 && !defined(__SANITIZE_ADDRESS__)
-+    !defined(__SANITIZE_ADDRESS__) && !defined(__sun)
- #define can_read_underside(ptr, size)                                          \
-   ((size) <= sizeof(uintptr_t) && ((PAGESIZE - (size)) & (uintptr_t)(ptr)) != 0)
- #endif /* can_fast_read */