diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index 06c343dcaf9..4fddecc5b0d 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.56 2009/06/15 23:33:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.57 2009/07/21 22:05:24 sthen Exp $
 
 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
 
-V=			1.4.25.1
+VER=			1.4.26
+# you can set PATCHVER=p0, p1 etc to bump everything,
+# this takes care of the subpackage/flavor maze
+PATCHVER=		
 CORESOUNDS=		1.4.15
-DISTNAME=		asterisk-$V
-FULLPKGNAME-main=	asterisk-$Vp0
-# N.B. overridden for h323 flavor below.
+DISTNAME=		asterisk-${VER:S/rc/-rc/}
+FULLPKGNAME-main=	asterisk-${VER}${PATCHVER}
 
 CATEGORIES=		telephony
 
@@ -112,7 +114,7 @@ CONFIGURE_ARGS+=	--with-netsnmp=${LOCALBASE}
 # XXX crashes at startup (bus error)
 #PSEUDO_FLAVORS+=	no_speex
 #.if ${FLAVOR:L:Mno_speex}
-#CONFIGURE_ARGS+=	--with-speex=no
+CONFIGURE_ARGS+=	--with-speex=no
 #.else
 #MULTI_PACKAGES+=	-speex
 #COMMENT-speex=		Speex codec for Asterisk
@@ -185,7 +187,7 @@ CPPFLAGS+=		-I${LOCALBASE}/include/openh323
 CONFIGURE_ARGS+=	--with-pwlib=${LOCALBASE}/lib \
 			--with-h323=${LOCALBASE}/lib
 WANTLIB-main+=		SDL avutil expat lber ldap ldap_r sasl2
-FULLPKGNAME-main=	asterisk-$Vp0-h323
+FULLPKGNAME-main=	asterisk-${VER}${PATCHVER}-h323
 
 pre-build:
 	cd ${WRKSRC} && ${MAKE_PROGRAM} include/asterisk/buildopts.h
@@ -197,8 +199,8 @@ CONFIGURE_ARGS+=	--with-pwlib=no \
 .endif
 
 .for i in ${MULTI_PACKAGES:S/-main//}
-FULLPKGNAME$i ?=	asterisk$i-$V
-RUN_DEPENDS$i +=	:asterisk-$V:telephony/asterisk
+FULLPKGNAME$i ?=	asterisk$i-${VER}${PATCHVER}
+RUN_DEPENDS$i +=	:asterisk-${VER}${PATCHVER}:telephony/asterisk
 .endfor
 
 MAKE_ENV=		ASTCFLAGS="${CFLAGS}" \
diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo
index 3e8c8f9c192..d0e83dda6dd 100644
--- a/telephony/asterisk/distinfo
+++ b/telephony/asterisk/distinfo
@@ -1,5 +1,5 @@
-MD5 (asterisk-1.4.25.1.tar.gz) = G0IhASfWYiyQ/FM43itKqQ==
-RMD160 (asterisk-1.4.25.1.tar.gz) = AvS1Ktxwx1PXYQVTgxMWb+yunyA=
-SHA1 (asterisk-1.4.25.1.tar.gz) = 3oO26mf+GRhszZs+4PL2wcxuekU=
-SHA256 (asterisk-1.4.25.1.tar.gz) = qXgEjkwODW4RbEI3+hCX77D2wdFIq8o5kPR05yetSsw=
-SIZE (asterisk-1.4.25.1.tar.gz) = 11642163
+MD5 (asterisk-1.4.26.tar.gz) = 9U1mhVM6FJoCQcNGiojgKg==
+RMD160 (asterisk-1.4.26.tar.gz) = X0k0XuHgwsyewfA1Cm3mrwslNcs=
+SHA1 (asterisk-1.4.26.tar.gz) = Yp39ZhZ4tJ4HJmQ0QI2TuTKHsCU=
+SHA256 (asterisk-1.4.26.tar.gz) = V8QTYsno6ldEdvRoR8ajxsGODu9LDPGjP6bFM+5zaGg=
+SIZE (asterisk-1.4.26.tar.gz) = 11660061
diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile
index a133d7ed4b1..7b7271fe050 100644
--- a/telephony/asterisk/patches/patch-Makefile
+++ b/telephony/asterisk/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.19 2009/03/29 22:23:35 sthen Exp $
---- Makefile.orig	Sat Nov 29 16:58:29 2008
-+++ Makefile	Wed Feb 18 20:05:57 2009
+$OpenBSD: patch-Makefile,v 1.20 2009/07/21 22:05:24 sthen Exp $
+--- Makefile.orig	Thu Jun 11 23:20:31 2009
++++ Makefile	Thu Jun 18 20:50:45 2009
 @@ -35,6 +35,7 @@ export ASTVARRUNDIR
  export MODULES_DIR
  export ASTSPOOLDIR
@@ -69,6 +69,15 @@ $OpenBSD: patch-Makefile,v 1.19 2009/03/29 22:23:35 sthen Exp $
  
  ifeq ($(PROC),ppc)
    ASTCFLAGS+=-fsigned-char
+@@ -404,7 +412,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+ 	rm -f build_tools/menuselect-deps
+ 
+ datafiles: _all
+-	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
++	if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" ksh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ # Should static HTTP be installed during make samples or even with its own target ala
+ # webvoicemail?  There are portions here that *could* be customized but might also be
+ # improved a lot.  I'll put it here for now.
 @@ -581,6 +589,7 @@ samples: adsi
  		echo "astetcdir => $(ASTETCDIR)" ; \
  		echo "astmoddir => $(MODULES_DIR)" ; \
diff --git a/telephony/asterisk/patches/patch-build_tools_mkpkgconfig b/telephony/asterisk/patches/patch-build_tools_mkpkgconfig
new file mode 100644
index 00000000000..708718f4d59
--- /dev/null
+++ b/telephony/asterisk/patches/patch-build_tools_mkpkgconfig
@@ -0,0 +1,9 @@
+$OpenBSD: patch-build_tools_mkpkgconfig,v 1.1 2009/07/21 22:05:24 sthen Exp $
+--- build_tools/mkpkgconfig.orig	Thu Jun 18 20:50:21 2009
++++ build_tools/mkpkgconfig	Thu Jun 18 20:50:25 2009
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/ksh
+ PPATH=$1
+ ## Make sure we were called from Makefile
+