diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile
index 0c9d0489c11..0f557b8e23e 100755
--- a/audio/speech-dispatcher/Makefile
+++ b/audio/speech-dispatcher/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2016/03/11 20:28:22 naddy Exp $
+# $OpenBSD: Makefile,v 1.20 2016/08/27 20:44:08 ajacoutot Exp $
 
 COMMENT=	common interface to speech synthesis
 
-DISTNAME=	speech-dispatcher-0.8.3
+DISTNAME=	speech-dispatcher-0.8.5
 
 SHARED_LIBS +=  speechd              2.1      # .8.0
 
@@ -14,12 +14,11 @@ HOMEPAGE=	http://devel.freebsoft.org/speechd
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += FLAC ao c dotconf espeak glib-2.0 gmodule-2.0 gthread-2.0
-WANTLIB += ltdl m ogg pcre pthread sndfile vorbis vorbisenc
+WANTLIB += iconv intl ltdl m ogg pcre pthread sndfile vorbis vorbisenc
 
 MASTER_SITES=	http://devel.freebsoft.org/pub/projects/speechd/
 
-MODULES=	devel/gettext \
-		textproc/intltool \
+MODULES=	textproc/intltool \
 		lang/python
 
 MODPY_VERSION=	${MODPY_DEFAULT_VERSION_3}
diff --git a/audio/speech-dispatcher/distinfo b/audio/speech-dispatcher/distinfo
index 7dee73766f9..62a137325f5 100644
--- a/audio/speech-dispatcher/distinfo
+++ b/audio/speech-dispatcher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (speech-dispatcher-0.8.3.tar.gz) = lqKTsroeJJjxKAx1qWB4kamZCUeo2H6YVcKmQsk/Hk8=
-SIZE (speech-dispatcher-0.8.3.tar.gz) = 1292321
+SHA256 (speech-dispatcher-0.8.5.tar.gz) = K0t4bUx9572PFc1L96Tc8dftoDnFUMOkNdFDRaHtVKI=
+SIZE (speech-dispatcher-0.8.5.tar.gz) = 1329317
diff --git a/audio/speech-dispatcher/patches/patch-src_server_speechd_c b/audio/speech-dispatcher/patches/patch-src_server_speechd_c
index bf94bf6d613..db123577cfb 100644
--- a/audio/speech-dispatcher/patches/patch-src_server_speechd_c
+++ b/audio/speech-dispatcher/patches/patch-src_server_speechd_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_server_speechd_c,v 1.2 2013/03/27 16:07:42 ajacoutot Exp $
---- src/server/speechd.c.orig	Fri Jul 13 15:07:58 2012
-+++ src/server/speechd.c	Wed Mar 27 16:02:15 2013
-@@ -590,8 +590,10 @@ void speechd_init()
+$OpenBSD: patch-src_server_speechd_c,v 1.3 2016/08/27 20:44:08 ajacoutot Exp $
+--- src/server/speechd.c.orig	Wed Aug 10 04:15:48 2016
++++ src/server/speechd.c	Sat Aug 27 22:41:04 2016
+@@ -618,8 +618,10 @@ void speechd_init()
  	if (g_module_supported() == FALSE)
  		DIE("Loadable modules not supported by current platform.\n");
  
diff --git a/audio/speech-dispatcher/patches/patch-src_server_speechd_h b/audio/speech-dispatcher/patches/patch-src_server_speechd_h
index 9512d932a0d..1a7a59d7897 100644
--- a/audio/speech-dispatcher/patches/patch-src_server_speechd_h
+++ b/audio/speech-dispatcher/patches/patch-src_server_speechd_h
@@ -1,10 +1,10 @@
-$OpenBSD: patch-src_server_speechd_h,v 1.4 2015/06/25 14:44:23 ajacoutot Exp $
+$OpenBSD: patch-src_server_speechd_h,v 1.5 2016/08/27 20:44:08 ajacoutot Exp $
 
 speechd.h:63: error: redefinition of 'union semun'
 
---- src/server/speechd.h.orig	Thu Jun  4 03:52:14 2015
-+++ src/server/speechd.h	Thu Jun 25 16:32:49 2015
-@@ -56,7 +56,7 @@
+--- src/server/speechd.h.orig	Wed Aug 10 04:12:10 2016
++++ src/server/speechd.h	Sat Aug 27 22:41:04 2016
+@@ -57,7 +57,7 @@
  /* TODO: This fixes compilation for Mac OS X but might not be a correct
     solution for other platforms. A better check is needed, possibly including
     _POSIX_C_SOURCE and friends*/
diff --git a/audio/speech-dispatcher/pkg/PLIST b/audio/speech-dispatcher/pkg/PLIST
index ff0e46c7aba..c9428de5c45 100644
--- a/audio/speech-dispatcher/pkg/PLIST
+++ b/audio/speech-dispatcher/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2015/06/25 14:44:23 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2016/08/27 20:44:08 ajacoutot Exp $
 bin/spd-conf
 @bin bin/spd-say
 @bin bin/spdsend
@@ -69,6 +69,7 @@ share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-generic.conf
 @sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-generic.conf
 share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-mbrola-generic.conf
 @sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-mbrola-generic.conf
+share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-ng.conf
 share/examples/speech-dispatcher/speech-dispatcher/modules/espeak.conf
 @sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak.conf
 share/examples/speech-dispatcher/speech-dispatcher/modules/festival.conf
@@ -100,16 +101,7 @@ share/speech-dispatcher/conf/desktop/
 share/speech-dispatcher/conf/desktop/speechd.desktop
 share/speech-dispatcher/conf/modules/
 share/speech-dispatcher/conf/modules/cicero.conf
-share/speech-dispatcher/conf/modules/dtk-generic.conf
-share/speech-dispatcher/conf/modules/epos-generic.conf
-share/speech-dispatcher/conf/modules/espeak-generic.conf
-share/speech-dispatcher/conf/modules/espeak-mbrola-generic.conf
+share/speech-dispatcher/conf/modules/espeak-ng.conf
 share/speech-dispatcher/conf/modules/espeak.conf
 share/speech-dispatcher/conf/modules/festival.conf
-share/speech-dispatcher/conf/modules/flite.conf
-share/speech-dispatcher/conf/modules/ibmtts.conf
-share/speech-dispatcher/conf/modules/ivona.conf
-share/speech-dispatcher/conf/modules/llia_phon-generic.conf
-share/speech-dispatcher/conf/modules/pico-generic.conf
-share/speech-dispatcher/conf/modules/swift-generic.conf
 share/speech-dispatcher/conf/speechd.conf