diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index 887d63fc793..fc72f0e0149 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2008/05/27 20:56:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2008/05/27 22:14:34 sthen Exp $
 
 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
 
-V=			1.4.19.2
+V=			1.4.20.1
 DISTNAME=		asterisk-$V
 FULLPKGNAME-main=	asterisk-$V
 
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+=	--with-snmp=no
 .else
 MULTI_PACKAGES+=	-snmp
 COMMENT-snmp=		Net-SNMP support for Asterisk
-WANTLIB-snmp=		c crypto kvm m perl util wrap
+WANTLIB-snmp=		c m perl util
 LIB_DEPENDS-snmp=	netsnmp.>=7::net/net-snmp \
 			netsnmpagent.>=7::net/net-snmp \
 			netsnmphelpers.>=7::net/net-snmp \
@@ -107,8 +107,10 @@ CONFIGURE_ARGS+=	--with-speex=no
 MULTI_PACKAGES+=	-speex
 COMMENT-speex=		Speex codec for Asterisk
 WANTLIB-speex=		m
-LIB_DEPENDS-speex=	speex.>=6::audio/speex
-CONFIGURE_ARGS+=	--with-speex=${LOCALBASE}
+LIB_DEPENDS-speex=	speex.>=6::audio/speex \
+			speexdsp::audio/speex
+CONFIGURE_ARGS+=	--with-speex=${LOCALBASE} \
+			--with-speexdsp=${LOCALBASE}
 .endif
 
 # ogg
diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo
index e3927690537..ff1fade1ebe 100644
--- a/telephony/asterisk/distinfo
+++ b/telephony/asterisk/distinfo
@@ -1,5 +1,5 @@
-MD5 (asterisk-1.4.19.2.tar.gz) = qUI2fiCjZFEIgcCGo1FzIQ==
-RMD160 (asterisk-1.4.19.2.tar.gz) = CAIS2XRF7JK8wGd4cU9GXQuCSNo=
-SHA1 (asterisk-1.4.19.2.tar.gz) = IlboRA+rQhjxOiL6z+LYs5ZUXnQ=
-SHA256 (asterisk-1.4.19.2.tar.gz) = sySLhOyCTDwhhhYH/cDHHkrO4W7cVwAE7myeL3EnBcQ=
-SIZE (asterisk-1.4.19.2.tar.gz) = 11496546
+MD5 (asterisk-1.4.20.1.tar.gz) = TkwM3ZfLD3sAfU93MiKiqQ==
+RMD160 (asterisk-1.4.20.1.tar.gz) = O8kyy2hTjNFtIU+H2eBqa4TqeWg=
+SHA1 (asterisk-1.4.20.1.tar.gz) = QCwG/fUXG97skPCkVvVYIjDGQoQ=
+SHA256 (asterisk-1.4.20.1.tar.gz) = mSqn+rDkdLVc/qy8OgVuKazlb9SWidvaM0to/+ZrOgI=
+SIZE (asterisk-1.4.20.1.tar.gz) = 11510578
diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile
index 98b263b1438..8112f529024 100644
--- a/telephony/asterisk/patches/patch-Makefile
+++ b/telephony/asterisk/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.16 2008/04/02 23:18:11 sthen Exp $
---- Makefile.orig	Tue Mar 25 14:37:35 2008
-+++ Makefile	Fri Mar 28 23:41:28 2008
+$OpenBSD: patch-Makefile,v 1.17 2008/05/27 22:14:34 sthen Exp $
+--- Makefile.orig	Mon May  5 21:17:55 2008
++++ Makefile	Wed May 21 01:24:30 2008
 @@ -35,6 +35,7 @@ export ASTVARRUNDIR
  export MODULES_DIR
  export ASTSPOOLDIR
@@ -69,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.16 2008/04/02 23:18:11 sthen Exp $
  
  ifeq ($(PROC),ppc)
    ASTCFLAGS+=-fsigned-char
-@@ -573,13 +581,14 @@ samples: adsi
+@@ -575,13 +583,14 @@ samples: adsi
  		echo "astetcdir => $(ASTETCDIR)" ; \
  		echo "astmoddir => $(MODULES_DIR)" ; \
  		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
@@ -85,7 +85,7 @@ $OpenBSD: patch-Makefile,v 1.16 2008/04/02 23:18:11 sthen Exp $
  		echo ";verbose = 3" ; \
  		echo ";debug = 3" ; \
  		echo ";alwaysfork = yes ; same as -F at startup" ; \
-@@ -603,15 +612,15 @@ samples: adsi
+@@ -605,15 +614,15 @@ samples: adsi
  		echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
  		echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \
  		echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
diff --git a/telephony/asterisk/patches/patch-configure b/telephony/asterisk/patches/patch-configure
index fea17bcfc02..45b52fcca3a 100644
--- a/telephony/asterisk/patches/patch-configure
+++ b/telephony/asterisk/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
---- configure.orig	Tue Mar 11 14:33:45 2008
-+++ configure	Tue Mar 18 09:45:42 2008
-@@ -23314,13 +23314,13 @@ if test "${USE_UNIXODBC}" != "no"; then
+$OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $
+--- configure.orig	Fri May  9 17:34:08 2008
++++ configure	Wed May 21 01:24:30 2008
+@@ -23526,13 +23526,13 @@ if test "${USE_UNIXODBC}" != "no"; then
        	 pbxlibdir="-L${UNIXODBC_DIR}"
        fi
     fi
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23383,7 +23383,7 @@ fi
+@@ -23595,7 +23595,7 @@ fi
  
  
     if test "${AST_UNIXODBC_FOUND}" = "yes"; then
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
        UNIXODBC_HEADER_FOUND="1"
        if test "x${UNIXODBC_DIR}" != "x"; then
           UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
-@@ -26899,7 +26899,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -27520,7 +27520,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  		PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'`
  		PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.`
  		PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.`
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
  		let PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}
  		let PWLIB_REQ=1*10000+9*100+2
  
-@@ -27001,6 +27001,9 @@ esac
+@@ -27622,6 +27622,9 @@ esac
  
  PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
  
@@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
  
  
  
-@@ -27859,7 +27862,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -28480,7 +28483,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  		OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'`
  		OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.`
  		OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.`
@@ -55,7 +55,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
  		let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}
  		let OPENH323_REQ=1*10000+17*100+3
  
-@@ -27880,7 +27883,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -28501,7 +28504,7 @@ echo "${ECHO_T}yes" >&6; }
  		{ echo "$as_me:$LINENO: checking OpenH323 build option" >&5
  echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; }
  		OPENH323_SUFFIX=
@@ -64,7 +64,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
  		for pfx in $prefixes; do
  			files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null`
  			libfile=
-@@ -27908,7 +27911,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
+@@ -28529,7 +28532,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
  			d)
  				OPENH323_BUILD="debug";;
  			*)
@@ -74,7 +74,7 @@ $OpenBSD: patch-configure,v 1.6 2008/04/02 23:18:11 sthen Exp $
  					notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ 	]*=[ 	]*//'"`
  					if test "x$notrace" = "x"; then
  						notrace="0"
-@@ -32587,7 +32591,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
+@@ -33636,7 +33640,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
diff --git a/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk b/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk
index a8a7f8d68e8..7fcbd83c668 100644
--- a/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk
+++ b/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk
@@ -1,6 +1,6 @@
-$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.6 2008/04/02 23:18:11 sthen Exp $
---- contrib/scripts/safe_asterisk.orig	Tue Feb 12 22:22:54 2008
-+++ contrib/scripts/safe_asterisk	Tue Mar 18 09:45:42 2008
+$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.7 2008/05/27 22:14:34 sthen Exp $
+--- contrib/scripts/safe_asterisk.orig	Mon May  5 04:22:25 2008
++++ contrib/scripts/safe_asterisk	Wed May 21 12:36:13 2008
 @@ -1,20 +1,21 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -29,7 +29,16 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.6 2008/04/02 23:18:11 sthen Ex
  
  # run asterisk with this priority
  PRIORITY=0
-@@ -66,6 +67,12 @@ else
+@@ -29,7 +30,7 @@ PRIORITY=0
+ # Check if Asterisk is already running.  If it is, then bug out, because
+ # starting safe_asterisk when Asterisk is running is very bad.
+ VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'`
+-if [ "${VERSION:0:8}" = "Asterisk" ]; then # otherwise "Unable t"
++if [ "`echo $VERSION | cut -c 1-8`" = "Asterisk" ]; then
+ 	echo "Asterisk is already running.  $0 will exit now."
+ 	exit 1
+ fi
+@@ -74,6 +75,12 @@ else
  	# set the process's filemax to whatever set above
  	ulimit -n $MAXFILES
  
@@ -42,7 +51,7 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.6 2008/04/02 23:18:11 sthen Ex
  fi
  
  #
-@@ -162,7 +169,7 @@ run_asterisk()
+@@ -170,7 +177,7 @@ run_asterisk()
  		sleep $SLEEPSECS
  		if [ $KILLALLMPG123 ]
  		then
diff --git a/telephony/asterisk/patches/patch-main_asterisk_c b/telephony/asterisk/patches/patch-main_asterisk_c
index a1e5a8fcd57..8ddc0a56f98 100644
--- a/telephony/asterisk/patches/patch-main_asterisk_c
+++ b/telephony/asterisk/patches/patch-main_asterisk_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-main_asterisk_c,v 1.5 2008/04/02 23:18:11 sthen Exp $
---- main/asterisk.c.orig	Fri Mar  7 06:36:33 2008
-+++ main/asterisk.c	Tue Mar 18 09:45:42 2008
-@@ -2412,6 +2412,7 @@ static void ast_readconfig(void) 
+$OpenBSD: patch-main_asterisk_c,v 1.6 2008/05/27 22:14:34 sthen Exp $
+--- main/asterisk.c.orig	Wed May 21 19:52:07 2008
++++ main/asterisk.c	Sat May 24 08:35:33 2008
+@@ -2462,6 +2462,7 @@ static void ast_readconfig(void) 
  			snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value);
  		} else if (!strcasecmp(v->name, "astvarlibdir")) {
  			ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
@@ -9,7 +9,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.5 2008/04/02 23:18:11 sthen Exp $
  			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
  		} else if (!strcasecmp(v->name, "astdatadir")) {
  			ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
-@@ -2709,6 +2710,7 @@ int main(int argc, char *argv[])
+@@ -2759,6 +2760,7 @@ int main(int argc, char *argv[])
  		rungroup = ast_config_AST_RUN_GROUP;
  	if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER))
  		runuser = ast_config_AST_RUN_USER;