diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index a66b6a7427d..30bc4deb361 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.51 2018/05/18 20:10:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2018/06/16 13:47:22 sthen Exp $
 
 COMMENT=	event-driven spam filtering system in C/Lua
 
 GH_ACCOUNT=	vstakhov
 GH_PROJECT=	rspamd
-GH_TAGNAME=	1.7.5
+GH_TAGNAME=	1.7.6
 
 CATEGORIES=	mail
 
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index f8219cdc861..84407dbb19a 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.7.5.tar.gz) = WqL/csx06h/SIM06lBdFJoZmRlvnEsTQFKn8k3t7H18=
-SIZE (rspamd-1.7.5.tar.gz) = 4494681
+SHA256 (rspamd-1.7.6.tar.gz) = KX+4Vk3iErJ+HaaDqDnNgzwm/IAt5mvGdt3xuS322I4=
+SIZE (rspamd-1.7.6.tar.gz) = 4521023
diff --git a/mail/rspamd/patches/patch-contrib_lpeg_CMakeLists_txt b/mail/rspamd/patches/patch-contrib_lpeg_CMakeLists_txt
deleted file mode 100644
index 2b40244c7b5..00000000000
--- a/mail/rspamd/patches/patch-contrib_lpeg_CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-contrib_lpeg_CMakeLists_txt,v 1.2 2017/03/08 17:02:13 sthen Exp $
---- contrib/lpeg/CMakeLists.txt.orig	Sun Dec 25 11:19:27 2016
-+++ contrib/lpeg/CMakeLists.txt	Sun Mar  5 15:28:22 2017
-@@ -5,9 +5,6 @@ SET(LPEGSRC lpcap.c
-         lpvm.c)
- 
- IF(ENABLE_FULL_DEBUG MATCHES "OFF")
--if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
--    SET(LPEG_CFLAGS "${LPEG_CFLAGS} -O3")
--endif ()
- ENDIF()
- 
- SET(LIB_TYPE STATIC)
diff --git a/mail/rspamd/patches/patch-contrib_torch_torch7_lib_TH_THGeneral_c b/mail/rspamd/patches/patch-contrib_torch_torch7_lib_TH_THGeneral_c
deleted file mode 100644
index e5926a1d687..00000000000
--- a/mail/rspamd/patches/patch-contrib_torch_torch7_lib_TH_THGeneral_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-contrib_torch_torch7_lib_TH_THGeneral_c,v 1.1 2018/03/19 15:36:13 sthen Exp $
-
-Index: contrib/torch/torch7/lib/TH/THGeneral.c
---- contrib/torch/torch7/lib/TH/THGeneral.c.orig
-+++ contrib/torch/torch7/lib/TH/THGeneral.c
-@@ -15,7 +15,7 @@
-   #if defined(__FreeBSD__)
-     #include <malloc_np.h>
-   #else
--    #include <malloc.h>
-+    #include <stdlib.h>
-   #endif
- #elif defined(__APPLE__)
- #include <malloc/malloc.h>
diff --git a/mail/rspamd/patches/patch-src_rspamadm_CMakeLists_txt b/mail/rspamd/patches/patch-src_rspamadm_CMakeLists_txt
index 52fe2e02b74..9b6ea8546e6 100644
--- a/mail/rspamd/patches/patch-src_rspamadm_CMakeLists_txt
+++ b/mail/rspamd/patches/patch-src_rspamadm_CMakeLists_txt
@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_rspamadm_CMakeLists_txt,v 1.8 2018/03/19 15:36:13 sthen Exp $
+$OpenBSD: patch-src_rspamadm_CMakeLists_txt,v 1.9 2018/06/16 13:47:22 sthen Exp $
 Index: src/rspamadm/CMakeLists.txt
 --- src/rspamadm/CMakeLists.txt.orig
 +++ src/rspamadm/CMakeLists.txt
-@@ -33,9 +33,9 @@ TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
+@@ -28,9 +28,9 @@ TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
  TARGET_LINK_LIBRARIES(rspamadm ${RSPAMD_REQUIRED_LIBRARIES})
  TARGET_LINK_LIBRARIES(rspamadm rspamd-linenoise)
  
diff --git a/mail/rspamd/pkg/PLIST b/mail/rspamd/pkg/PLIST
index 48d315fc01c..12786719957 100644
--- a/mail/rspamd/pkg/PLIST
+++ b/mail/rspamd/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.19 2018/05/18 20:10:23 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.20 2018/06/16 13:47:22 sthen Exp $
 @newgroup _rspamd:756
 @newuser _rspamd:756:_rspamd:daemon:Rspamd Account:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/rspamd
+@sample ${SYSCONFDIR}/rspamd/
 @bin bin/rspamadm
 @bin bin/rspamc
 @bin bin/rspamd
@@ -16,7 +18,6 @@ lib/rspamd/libtorch.so
 @man man/man1/rspamc.1
 @man man/man8/rspamd.8
 share/examples/rspamd/
-@sample ${SYSCONFDIR}/rspamd/
 share/examples/rspamd/2tld.inc
 @sample ${SYSCONFDIR}/rspamd/2tld.inc
 share/examples/rspamd/actions.conf
@@ -244,6 +245,8 @@ share/rspamd/languages/vi.json
 share/rspamd/languages/yi.json
 share/rspamd/languages/zh-CN.json
 share/rspamd/lib/
+share/rspamd/lib/ansicolors.lua
+share/rspamd/lib/argparse.lua
 share/rspamd/lib/decisiontree/
 share/rspamd/lib/decisiontree/CartNode.lua
 share/rspamd/lib/decisiontree/CartTrainer.lua
@@ -503,18 +506,17 @@ share/rspamd/lib/optim/rprop.lua
 share/rspamd/lib/optim/sgd.lua
 share/rspamd/lib/paths/
 share/rspamd/lib/paths/init.lua
+share/rspamd/lib/plugins_stats.lua
+share/rspamd/lib/rescore_utility.lua
 share/rspamd/lib/rspamadm/
-share/rspamd/lib/rspamadm/ansicolors.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/rescore.lua
-share/rspamd/lib/rspamadm/rescore_utility.lua
 share/rspamd/lib/rspamadm/stat_convert.lua
 share/rspamd/lib/torch/
 share/rspamd/lib/torch/CmdLine.lua
@@ -629,6 +631,3 @@ share/rspamd/www/react-index.html
 @owner _rspamd
 @group _rspamd
 @sample ${LOCALSTATEDIR}/rspamd/
-@owner
-@group
-@rcscript ${RCDIR}/rspamd