diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index 4dd98498d6a..ebb1613eed4 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.158 2012/08/30 22:45:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.159 2012/09/15 12:43:49 sthen Exp $
 
 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
 
-VER=			1.8.15.1
+VER=			1.8.16.0
 DISTNAME=		asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
 PKGNAME-main=		asterisk-${VER}
 
@@ -144,8 +144,8 @@ CONFIGURE_ARGS+=	--with-imap=no
 
 # calendar
 COMMENT-calendar=	calendar support for Asterisk
-WANTLIB-calendar=	${MODGETTEXT_WANTLIB} asn1 c crypto expat gssapi \
-			ical iksemel krb5 m neon proxy pthread ssl xml2 z
+WANTLIB-calendar=	${MODGETTEXT_WANTLIB} asn1 crypto expat gssapi \
+			ical iksemel krb5 m neon proxy ssl xml2 z
 LIB_DEPENDS-calendar=	net/neon \
 			textproc/libical \
 			${MODGETTEXT_LIB_DEPENDS}
@@ -156,7 +156,7 @@ CONFIGURE_ARGS+=	--with-ical=no
 # http_post
 COMMENT-http_post=	HTTP POST support for Asterisk
 LIB_DEPENDS-http_post=	mail/gmime ${MODGETTEXT_LIB_DEPENDS}
-WANTLIB-http_post=	c gio-2.0 glib-2.0 gmime-2.6 gobject-2.0 pthread \
+WANTLIB-http_post=	gio-2.0 glib-2.0 gmime-2.6 gobject-2.0 \
 			${MODGETTEXT_WANTLIB}
 .if !${BUILD_PACKAGES:M-http_post}
 CONFIGURE_ARGS+=	--with-gmime=no
@@ -165,7 +165,7 @@ CONFIGURE_ARGS+=	--with-gmime=no
 # ldap
 COMMENT-ldap=		LDAP support for Asterisk
 LIB_DEPENDS-ldap=	databases/openldap,-main
-WANTLIB-ldap=		c ldap
+WANTLIB-ldap=		ldap
 .if !${BUILD_PACKAGES:M-ldap}
 CONFIGURE_ARGS+=	--with-ldap=no
 .endif
@@ -185,7 +185,7 @@ CONFIGURE_ARGS+=	--with-ldap=no
 # odbc
 COMMENT-odbc=		ODBC support for Asterisk
 LIB_DEPENDS-odbc=	databases/iodbc
-WANTLIB-odbc=		c iodbc pthread
+WANTLIB-odbc=		iodbc pthread
 .if !${BUILD_PACKAGES:M-odbc}
 CONFIGURE_ARGS+=	--with-iodbc=no \
 			--with-ltdl=no
@@ -193,7 +193,7 @@ CONFIGURE_ARGS+=	--with-iodbc=no \
 
 # postgresql
 COMMENT-pgsql=		PostgreSQL support for Asterisk
-WANTLIB-pgsql=		c pq z
+WANTLIB-pgsql=		pq z
 LIB_DEPENDS-pgsql=	databases/postgresql
 .if !${BUILD_PACKAGES:M-pgsql}
 CONFIGURE_ARGS+=	--with-postgres=no
@@ -201,7 +201,7 @@ CONFIGURE_ARGS+=	--with-postgres=no
 
 # snmp
 COMMENT-snmp=		Net-SNMP support for Asterisk
-WANTLIB-snmp=		c m netsnmp netsnmpagent netsnmpmibs crypto kvm wrap
+WANTLIB-snmp=		m netsnmp netsnmpagent netsnmpmibs crypto kvm wrap
 LIB_DEPENDS-snmp=	net/net-snmp
 .if !${BUILD_PACKAGES:M-snmp}
 CONFIGURE_ARGS+=	--with-snmp=no
@@ -209,7 +209,7 @@ CONFIGURE_ARGS+=	--with-snmp=no
 
 # speex
 COMMENT-speex=		Speex codec for Asterisk
-WANTLIB-speex=		c m speex speexdsp
+WANTLIB-speex=		m speex speexdsp
 LIB_DEPENDS-speex=	audio/speex>=1.2rc1
 .if !${BUILD_PACKAGES:M-speex}
 CONFIGURE_ARGS+=	--with-speex=no
diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo
index e6502c62220..978ba5d69ab 100644
--- a/telephony/asterisk/distinfo
+++ b/telephony/asterisk/distinfo
@@ -1,11 +1,11 @@
-SHA256 (asterisk-1.8.15.1.tar.gz) = mT6kuKUiQt0YhKWw77AHZ4D9szZ0Mf90rIk35qaudV4=
+SHA256 (asterisk-1.8.16.0.tar.gz) = xFqJWbBr14nSfmFrz75QTUjj8tN5k8RbPIvJyzYk0tw=
 SHA256 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = eRdRl6ZRwlu2KYjnIQI+m7cRx+7yisouy6KR1D7j5mc=
 SHA256 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = ye/FmyBQU27CFiXULLsvWqivxjKK8NIIvq0rWJ8rRzI=
 SHA256 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 1fAxzDHr6+yZzj/PRP+Ue9eye16VZaezphhcLRvaCUw=
 SHA256 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = a0BErk9wQ3/hT5gPUVL6uk6iqitdhAKMAhOrL2XHSR8=
 SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz) = RJ+4ENFlAsMFL+3wL353s2IGrFoUXz2s9Bd4Q6L8tTg=
 SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = Y8VUFsoRQmGrGvT9EVIyLy7GnZGrw0vEzufTKByuDZc=
-SIZE (asterisk-1.8.15.1.tar.gz) = 25077347
+SIZE (asterisk-1.8.16.0.tar.gz) = 25085895
 SIZE (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = 2042362
 SIZE (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = 84
 SIZE (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898
diff --git a/telephony/asterisk/patches/patch-main_features_c b/telephony/asterisk/patches/patch-main_features_c
index 415bfd9d490..035068565de 100644
--- a/telephony/asterisk/patches/patch-main_features_c
+++ b/telephony/asterisk/patches/patch-main_features_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-main_features_c,v 1.5 2012/08/04 21:53:56 sthen Exp $
---- main/features.c.orig	Mon Jun 25 16:57:28 2012
-+++ main/features.c	Mon Jul 30 23:13:45 2012
-@@ -1014,7 +1014,9 @@ static void bridge_call_thread_launch(struct ast_bridg
+$OpenBSD: patch-main_features_c,v 1.6 2012/09/15 12:43:49 sthen Exp $
+--- main/features.c.orig	Tue Sep 11 17:15:05 2012
++++ main/features.c	Wed Sep 12 14:36:19 2012
+@@ -1045,7 +1045,9 @@ static void bridge_call_thread_launch(struct ast_bridg
  	}
  	pthread_attr_destroy(&attr);
  	memset(&sched, 0, sizeof(sched));