diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index 788e7ad8de8..5f7c504246b 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2007/10/11 08:05:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2007/11/27 10:41:04 sthen Exp $
 
 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
 
-V=			1.4.13
+V=			1.4.14
 DISTNAME=		asterisk-$V
 FULLPKGNAME-main=	${DISTNAME}
 
@@ -60,9 +60,7 @@ CONFIGURE_ARGS+=	--with-osptk=no \
 			--with-radius=no \
 			--with-sqlite=no \
 			--with-tds=no \
-			--with-imap=no \
-			--with-pwlib=no \
-			--with-h323=no
+			--with-imap=no
 
 # Some build options (including a useful malloc debug) are available
 # via menuselect. They may be enabled by running 'make configure', cd
@@ -70,6 +68,7 @@ CONFIGURE_ARGS+=	--with-osptk=no \
 # and 'make'.
 
 FLAVOR?=
+FLAVORS=		h323
 
 # odbc
 PSEUDO_FLAVORS+=        no_odbc
@@ -165,6 +164,21 @@ CONFIGURE_ARGS+=        --with-gnutls=${LOCALBASE} \
 			--with-iksemel=${LOCALBASE}
 .endif
 
+# h323
+.if ${FLAVOR:L:Mh323}
+IS_INTERACTIVE=		Yes
+# must restart build by hand.
+LIB_DEPENDS-main+=	h323::net/openh323 \
+			pt::devel/pwlib
+CONFIGURE_ARGS+=	--with-pwlib=${LOCALBASE}/lib \
+			--with-h323=${LOCALBASE}/lib
+WANTLIB-main+=		expat ossaudio avutil
+FULLPKGNAME-main=	${DISTNAME}-h323
+.else
+CONFIGURE_ARGS+=	--with-pwlib=no \
+			--with-h323=no
+.endif
+
 .for i in ${MULTI_PACKAGES:S/-main//}
 FULLPKGNAME$i=		asterisk$i-$V
 RUN_DEPENDS$i=		:asterisk-$V:telephony/asterisk
diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo
index 6b63a8e58a1..ab21d566c0a 100644
--- a/telephony/asterisk/distinfo
+++ b/telephony/asterisk/distinfo
@@ -1,5 +1,5 @@
-MD5 (asterisk-1.4.13.tar.gz) = SbcxFIMcIcyXhNOz9Ptb7A==
-RMD160 (asterisk-1.4.13.tar.gz) = bgImiL18CnrthNbOffaiaS6PFDg=
-SHA1 (asterisk-1.4.13.tar.gz) = dsB9y8Ob937z3m66XTRaHyLR3BY=
-SHA256 (asterisk-1.4.13.tar.gz) = C+ovYSx7brz7l8d9RzpFAYo+ES5WEP9/q4NWG+exlEk=
-SIZE (asterisk-1.4.13.tar.gz) = 11257579
+MD5 (asterisk-1.4.14.tar.gz) = oRun8tOT5Wyq/KgMEUcpHQ==
+RMD160 (asterisk-1.4.14.tar.gz) = 9xv9dGI5kFuQtVD1GtJ9kxe9HAo=
+SHA1 (asterisk-1.4.14.tar.gz) = t2UbFYAeSpwfvGRbX7bPlZYOkqI=
+SHA256 (asterisk-1.4.14.tar.gz) = LQ/ITtFl8Uau/ldeupTCZ8VPurULe1TTwEmQrd4Kky0=
+SIZE (asterisk-1.4.14.tar.gz) = 11279263
diff --git a/telephony/asterisk/patches/patch-Makefile b/telephony/asterisk/patches/patch-Makefile
index c48ce8bada6..93323950c97 100644
--- a/telephony/asterisk/patches/patch-Makefile
+++ b/telephony/asterisk/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.12 2007/10/04 11:25:44 sthen Exp $
---- Makefile.orig	Tue Oct  2 21:06:07 2007
-+++ Makefile	Wed Oct  3 12:50:21 2007
+$OpenBSD: patch-Makefile,v 1.13 2007/11/27 10:41:04 sthen Exp $
+--- Makefile.orig	Thu Nov 15 18:37:38 2007
++++ Makefile	Sat Nov 17 00:58:06 2007
 @@ -35,6 +35,7 @@ export ASTVARRUNDIR
  export MODULES_DIR
  export ASTSPOOLDIR
@@ -46,16 +46,18 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/04 11:25:44 sthen Exp $
  
  MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
  OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
-@@ -194,7 +198,7 @@ ifeq ($(OSARCH),linux-gnu)
-   endif
+@@ -195,8 +199,10 @@ ifeq ($(OSARCH),linux-gnu)
  endif
  
--ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
++ifneq ($(OSARCH),OpenBSD)
+ ASTCFLAGS+=-pipe
+ endif
++endif
  
- ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
+ ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
  
-@@ -207,9 +211,11 @@ ifneq ($(findstring BSD,$(OSARCH)),)
+@@ -211,9 +217,11 @@ ifneq ($(findstring BSD,$(OSARCH)),)
    ASTLDFLAGS+=-L/usr/local/lib
  endif
  
@@ -67,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/04 11:25:44 sthen Exp $
  
  ifeq ($(PROC),ppc)
    ASTCFLAGS+=-fsigned-char
-@@ -552,21 +558,25 @@ samples: adsi
+@@ -556,13 +564,14 @@ samples: adsi
  		echo "astetcdir => $(ASTETCDIR)" ; \
  		echo "astmoddir => $(MODULES_DIR)" ; \
  		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
@@ -80,17 +82,24 @@ $OpenBSD: patch-Makefile,v 1.12 2007/10/04 11:25:44 sthen Exp $
  		echo "" ; \
 -		echo ";[options]" ; \
 +		echo "[options]" ; \
- 		echo ";internal_timing = yes" ; \
- 		echo ";systemname = my_system_name ; prefix uniqueid with a system name for global uniqueness issues" ; \
+ 		echo ";verbose = 3" ; \
+ 		echo ";debug = 3" ; \
+ 		echo ";alwaysfork = yes ; same as -F at startup" ; \
+@@ -585,15 +594,15 @@ samples: adsi
+ 		echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \
+ 		echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
+ 		echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
+-		echo ";runuser = asterisk ; The user to run as" ; \
+-		echo ";rungroup = asterisk ; The group to run as" ; \
++		echo "runuser = _asterisk ; The user to run as" ; \
++		echo "rungroup = _asterisk ; The group to run as" ; \
+ 		echo "" ; \
  		echo "; Changing the following lines may compromise your security." ; \
 -		echo ";[files]" ; \
 -		echo ";astctlpermissions = 0660" ; \
 -		echo ";astctlowner = root" ; \
 -		echo ";astctlgroup = apache" ; \
 -		echo ";astctl = asterisk.ctl" ; \
-+		echo "runuser => _asterisk" ; \
-+		echo "rungroup => _asterisk" ; \
-+		echo "" ; \
 +		echo "[files]" ; \
 +		echo "astctlpermissions = 0660" ; \
 +		echo "astctlowner = _asterisk" ; \
diff --git a/telephony/asterisk/patches/patch-main_asterisk_c b/telephony/asterisk/patches/patch-main_asterisk_c
index 6488cbe0dba..f2b36e915e5 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.2 2007/10/04 11:25:44 sthen Exp $
---- main/asterisk.c.orig	Thu Sep 20 22:16:48 2007
-+++ main/asterisk.c	Wed Oct  3 12:50:22 2007
-@@ -2403,6 +2403,7 @@ static void ast_readconfig(void) 
+$OpenBSD: patch-main_asterisk_c,v 1.3 2007/11/27 10:41:04 sthen Exp $
+--- main/asterisk.c.orig	Wed Oct 17 16:23:51 2007
++++ main/asterisk.c	Sat Nov 17 00:45:45 2007
+@@ -2411,6 +2411,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.2 2007/10/04 11:25:44 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));
-@@ -2701,12 +2702,20 @@ int main(int argc, char *argv[])
+@@ -2708,6 +2709,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;
@@ -17,25 +17,3 @@ $OpenBSD: patch-main_asterisk_c,v 1.2 2007/10/04 11:25:44 sthen Exp $
  
  #ifndef __CYGWIN__
  
- 	if (!is_child_of_nonroot) 
- 		ast_set_priority(ast_opt_high_priority);
- 
-+	/*
-+	 * don't try to setuid()/setgid() when only running as 'asterisk -r'
-+	 * otherwise users must be root to reconnect to an existing instance,
-+	 * even if they already have filesystem permissions on asterisk.ctl
-+	 * (see asterisk.conf).
-+	 */
-+	if(!ast_opt_remote) {
- 	if (!is_child_of_nonroot && rungroup) {
- 		struct group *gr;
- 		gr = getgrnam(rungroup);
-@@ -2751,7 +2760,7 @@ int main(int argc, char *argv[])
- 		if (option_verbose)
- 			ast_verbose("Running as user '%s'\n", runuser);
- 	}
--
-+	}
- #endif /* __CYGWIN__ */
- 
- #ifdef linux
diff --git a/telephony/asterisk/pkg/DESCR-speex b/telephony/asterisk/pkg/DESCR-speex
index 58ee486a447..18be2c29a4a 100644
--- a/telephony/asterisk/pkg/DESCR-speex
+++ b/telephony/asterisk/pkg/DESCR-speex
@@ -1 +1 @@
-A driver for the Speex codec to be used in Asterisk channels.1
+A driver for the Speex codec to be used in Asterisk channels.
diff --git a/telephony/asterisk/pkg/PFRAG.h323-main b/telephony/asterisk/pkg/PFRAG.h323-main
new file mode 100644
index 00000000000..5e84f68b2e7
--- /dev/null
+++ b/telephony/asterisk/pkg/PFRAG.h323-main
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PFRAG.h323-main,v 1.1 2007/11/27 10:41:04 sthen Exp $
+lib/asterisk/modules/chan_h323.so
+share/doc/asterisk/h323.txt
+share/examples/asterisk/default/h323.conf
+@sample ${SYSCONFDIR}/asterisk/h323.conf
diff --git a/telephony/asterisk/pkg/PLIST-main b/telephony/asterisk/pkg/PLIST-main
index 5f1762e71e4..20b76cfc7c4 100644
--- a/telephony/asterisk/pkg/PLIST-main
+++ b/telephony/asterisk/pkg/PLIST-main
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2007/10/04 11:25:44 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.3 2007/11/27 10:41:04 sthen Exp $
 @conflict asterisk-sounds-<=1.2.1p2
 @conflict app_conference-<=20070710
 @newgroup _asterisk:545
 @newuser _asterisk:545:_asterisk:daemon:asterisk user:/nonexistent:/sbin/nologin
+%%h323%%
 include/asterisk/
 include/asterisk.h
 include/asterisk/abstract_jb.h
@@ -683,7 +684,6 @@ share/doc/asterisk/extconfig.txt
 share/doc/asterisk/extensions.txt
 share/doc/asterisk/externalivr.txt
 share/doc/asterisk/freetds.txt
-share/doc/asterisk/h323.txt
 share/doc/asterisk/hardware.txt
 share/doc/asterisk/iax.txt
 share/doc/asterisk/ices.txt
@@ -714,6 +714,7 @@ share/doc/asterisk/sla.tex
 share/doc/asterisk/smdi.txt
 share/doc/asterisk/sms.txt
 share/doc/asterisk/speechrec.txt
+share/doc/asterisk/valgrind.txt
 share/doc/asterisk/video.txt
 share/examples/asterisk/
 @sample ${SYSCONFDIR}/asterisk/
@@ -743,7 +744,6 @@ share/examples/asterisk/default/extensions.conf
 @comment share/examples/asterisk/default/features.conf
 share/examples/asterisk/default/festival.conf
 share/examples/asterisk/default/followme.conf
-@comment share/examples/asterisk/default/h323.conf
 share/examples/asterisk/default/http.conf
 share/examples/asterisk/default/iax.conf
 share/examples/asterisk/default/iaxprov.conf