diff --git a/telephony/asterisk/Makefile b/telephony/asterisk/Makefile
index b3cd6e87628..ed1393f0139 100644
--- a/telephony/asterisk/Makefile
+++ b/telephony/asterisk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.101 2011/03/02 12:53:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.102 2011/03/02 13:28:24 sthen Exp $
 
 SHARED_ONLY=		Yes
 COMMENT-main=		open source multi-protocol PBX and telephony toolkit
 
-VER=			1.8.2.4
+VER=			1.8.3
 DISTNAME=		asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
 PKGNAME-main=		asterisk-${VER}
 
diff --git a/telephony/asterisk/distinfo b/telephony/asterisk/distinfo
index e5a908ade8e..c527576425e 100644
--- a/telephony/asterisk/distinfo
+++ b/telephony/asterisk/distinfo
@@ -1,32 +1,32 @@
-MD5 (asterisk-1.8.2.4.tar.gz) = s81YZs5zYypEwN2y87GtHw==
+MD5 (asterisk-1.8.3.tar.gz) = eZZIaMEkqSHnH9Vo+8kpDw==
 MD5 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz) = XyGAxhZleNMCJj628d77lg==
 MD5 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz.sha1) = 4aZTAcb0h9zeG2sOVvVzDA==
 MD5 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = VHnLTLgdZ4ME2W815JM6EQ==
 MD5 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = euKCSaScLc2s72YD1p39Zg==
 MD5 (asterisk-moh-opsound-wav-2.03.tar.gz) = gnfixpP9BWdzscFeTVIHfQ==
 MD5 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = AR+k3J/jXcPTTtVXuwQmPw==
-RMD160 (asterisk-1.8.2.4.tar.gz) = r0IG9GxzuMkiepakVR88lpUnx5M=
+RMD160 (asterisk-1.8.3.tar.gz) = GVNR7jhtUZG+aXg7Q2JMTEErdBY=
 RMD160 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz) = QrmFXULU6TKurS7Ori+xyp/tsIs=
 RMD160 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz.sha1) = 9jjgmgvJGKJh4cM4vEIVdnKlNAQ=
 RMD160 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = aBcMdp1znWtbNbAPmZrWu/h2+fY=
 RMD160 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = r2FBQo0Mel1qCQPV61rbSFUnkNY=
 RMD160 (asterisk-moh-opsound-wav-2.03.tar.gz) = lWaXSoNgUeCPUUEt5QjZK/O+fgI=
 RMD160 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = D+hFjrIugSleLHkzLWEgvA7kjfM=
-SHA1 (asterisk-1.8.2.4.tar.gz) = 3snOjo29YADM0YDeBuzr90tx+TA=
+SHA1 (asterisk-1.8.3.tar.gz) = KffoeV7E1dnOWRL+y1szQ9GF1ic=
 SHA1 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz) = /1nj3UcJr0j69nws7CiWi9zWLk0=
 SHA1 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz.sha1) = 1DqTOIM1s1tS30CW8clyDq+R9Os=
 SHA1 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = hpL6YUI7R2nci/p4+vntXveiWbk=
 SHA1 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = 7mrmsEnCtwUNV0J+RJd/3sI3wYE=
 SHA1 (asterisk-moh-opsound-wav-2.03.tar.gz) = 9A/W6gPf6Ncq2iVAsiiL/cAGOB0=
 SHA1 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = y7b1cl1V/jLKmqKzM+N9YSXQ9Ec=
-SHA256 (asterisk-1.8.2.4.tar.gz) = l43JsfRYXDH6+iOobjR61Gp12LQ4wFlCP4BL6giLux0=
+SHA256 (asterisk-1.8.3.tar.gz) = l2rm3qDCIDMEmvi40ZyeBY8ToEukmhOyzp2p0tTAc5U=
 SHA256 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz) = 6HhpuMXN1zILHPTeUgh58lz4tcLaNwen7v4z4IlbsBc=
 SHA256 (asterisk-core-sounds-en-gsm-1.4.20.tar.gz.sha1) = CkpTcoPBJgMHmqgMDqUPfnmfDMz7fQGGuA/DwV+BR3c=
 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.2.4.tar.gz) = 26802859
+SIZE (asterisk-1.8.3.tar.gz) = 26806503
 SIZE (asterisk-core-sounds-en-gsm-1.4.20.tar.gz) = 1784804
 SIZE (asterisk-core-sounds-en-gsm-1.4.20.tar.gz.sha1) = 84
 SIZE (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898
diff --git a/telephony/asterisk/patches/patch-configure_ac b/telephony/asterisk/patches/patch-configure_ac
index 0f13bd1ec3c..c7320e66075 100644
--- a/telephony/asterisk/patches/patch-configure_ac
+++ b/telephony/asterisk/patches/patch-configure_ac
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.14 2011/01/19 11:25:16 sthen Exp $
---- configure.ac.orig	Wed Jan 12 16:52:31 2011
-+++ configure.ac	Fri Jan 14 21:48:05 2011
+$OpenBSD: patch-configure_ac,v 1.15 2011/03/02 13:28:24 sthen Exp $
+--- configure.ac.orig	Sun Jan  9 21:40:34 2011
++++ configure.ac	Wed Mar  2 13:00:15 2011
 @@ -55,7 +55,7 @@ AC_SUBST([astvarrundir],      ['${localstatedir}/run/a
  
  case "${host_os}" in
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2011/01/19 11:25:16 sthen Exp $
          astvarlibdir='${prefix}/share/asterisk'
          astdbdir='${localstatedir}/db/asterisk'
       fi
-@@ -1492,7 +1492,7 @@ if test "${USE_IMAP_TK}" != "no"; then
+@@ -1512,7 +1512,7 @@ if test "${USE_IMAP_TK}" != "no"; then
  			)
  		else #looking in imap directory didn't work, try c-client
  			imap_ldflags=""
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2011/01/19 11:25:16 sthen Exp $
  			imap_include="-DUSE_SYSTEM_CCLIENT"
  			CPPFLAGS="${saved_cppflags}"
  			LIBS="${saved_libs}"
-@@ -1702,7 +1702,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
+@@ -1722,7 +1722,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
  
  AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])
  
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2011/01/19 11:25:16 sthen Exp $
  
  AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], [])
  
-@@ -1854,7 +1854,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
+@@ -1874,7 +1874,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != "
  	AST_CHECK_OPENH323()
  	AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3], [], [1], [19], [0])
  	AST_CHECK_OPENH323_BUILD()
@@ -38,7 +38,7 @@ $OpenBSD: patch-configure_ac,v 1.14 2011/01/19 11:25:16 sthen Exp $
  	AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323],
  		[Define if your system has the OpenH323 libraries.],
  		[#include "ptlib.h"
-@@ -2009,7 +2010,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
+@@ -2029,7 +2030,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [
  
  if test "${OSARCH}" = "OpenBSD";
  then
diff --git a/telephony/asterisk/patches/patch-main_strcompat_c b/telephony/asterisk/patches/patch-main_strcompat_c
deleted file mode 100644
index 8b48228ad54..00000000000
--- a/telephony/asterisk/patches/patch-main_strcompat_c
+++ /dev/null
@@ -1,52 +0,0 @@
-$OpenBSD: patch-main_strcompat_c,v 1.1 2011/01/20 16:26:26 sthen Exp $
-
-r301263 from svn; fix byte-order conversions for little-endian machines.
-
---- main/strcompat.c.orig	Thu Jan 20 09:07:25 2011
-+++ main/strcompat.c	Thu Jan 20 09:09:42 2011
-@@ -367,14 +367,14 @@ uint64_t ntohll(uint64_t net64)
- 	} number;
- 	number.u = net64;
- 	return
--		(((uint64_t) number.c[0]) <<  0) |
--		(((uint64_t) number.c[1]) <<  8) |
--		(((uint64_t) number.c[2]) << 16) |
--		(((uint64_t) number.c[3]) << 24) |
--		(((uint64_t) number.c[4]) << 32) |
--		(((uint64_t) number.c[5]) << 40) |
--		(((uint64_t) number.c[6]) << 48) |
--		(((uint64_t) number.c[7]) << 56);
-+		(((uint64_t) number.c[0]) << 56) |
-+		(((uint64_t) number.c[1]) << 48) |
-+		(((uint64_t) number.c[2]) << 40) |
-+		(((uint64_t) number.c[3]) << 32) |
-+		(((uint64_t) number.c[4]) << 24) |
-+		(((uint64_t) number.c[5]) << 16) |
-+		(((uint64_t) number.c[6]) <<  8) |
-+		(((uint64_t) number.c[7]) <<  0);
- #else
- 	#error "Unknown byte order"
- #endif
-@@ -393,14 +393,14 @@ uint64_t htonll(uint64_t host64)
- 	} number;
- 	number.u = host64;
- 	return
--		(((uint64_t) number.c[0]) <<  0) |
--		(((uint64_t) number.c[1]) <<  8) |
--		(((uint64_t) number.c[2]) << 16) |
--		(((uint64_t) number.c[3]) << 24) |
--		(((uint64_t) number.c[4]) << 32) |
--		(((uint64_t) number.c[5]) << 40) |
--		(((uint64_t) number.c[6]) << 48) |
--		(((uint64_t) number.c[7]) << 56);
-+		(((uint64_t) number.c[0]) << 56) |
-+		(((uint64_t) number.c[1]) << 48) |
-+		(((uint64_t) number.c[2]) << 40) |
-+		(((uint64_t) number.c[3]) << 32) |
-+		(((uint64_t) number.c[4]) << 24) |
-+		(((uint64_t) number.c[5]) << 16) |
-+		(((uint64_t) number.c[6]) <<  8) |
-+		(((uint64_t) number.c[7]) <<  0);
- #else
- 	#error "Unknown byte order"
- #endif
diff --git a/telephony/asterisk/patches/patch-sounds_Makefile b/telephony/asterisk/patches/patch-sounds_Makefile
index c4e36c4af99..c0cf59fa35b 100644
--- a/telephony/asterisk/patches/patch-sounds_Makefile
+++ b/telephony/asterisk/patches/patch-sounds_Makefile
@@ -1,8 +1,8 @@
-$OpenBSD: patch-sounds_Makefile,v 1.6 2011/01/19 11:25:16 sthen Exp $
---- sounds/Makefile.orig	Mon Oct 18 23:02:23 2010
-+++ sounds/Makefile	Tue Oct 19 01:43:02 2010
-@@ -135,6 +135,8 @@ endif
- all: $(SOUNDS_CACHE_DIR) $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
+$OpenBSD: patch-sounds_Makefile,v 1.7 2011/03/02 13:28:24 sthen Exp $
+--- sounds/Makefile.orig	Wed Dec 29 19:28:36 2010
++++ sounds/Makefile	Wed Mar  2 13:00:16 2011
+@@ -150,6 +150,8 @@ prefixcmd:
+ 	@$(PREFIXCMD)
  
  have_download:
 +
diff --git a/telephony/asterisk/pkg/PLIST-main b/telephony/asterisk/pkg/PLIST-main
index a061e29e0da..95aadb5d00d 100644
--- a/telephony/asterisk/pkg/PLIST-main
+++ b/telephony/asterisk/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.35 2011/01/19 11:25:16 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.36 2011/03/02 13:28:24 sthen Exp $
 @conflict asterisk-sounds-<=1.2.1p2
 @conflict asterisk-curl-*
 @conflict asterisk-fax-*
@@ -874,6 +874,7 @@ share/doc/asterisk/UPGRADE-1.6.txt
 share/doc/asterisk/UPGRADE.txt
 share/doc/asterisk/api-1.6.0-changes.odt
 share/doc/asterisk/api-1.6.2-changes.txt
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/asterisk/
 @mode 750
 @group _asterisk
@@ -894,7 +895,6 @@ share/examples/asterisk/default/asterisk.conf
 share/examples/asterisk/default/calendar.conf
 share/examples/asterisk/default/ccss.conf
 share/examples/asterisk/default/cdr.conf
-@sample ${SYSCONFDIR}/asterisk/cdr.conf
 share/examples/asterisk/default/cdr_custom.conf
 share/examples/asterisk/default/cdr_manager.conf
 @comment share/examples/asterisk/default/cdr_mysql.conf
@@ -978,6 +978,8 @@ share/examples/asterisk/default/users.conf
 share/examples/asterisk/default/voicemail.conf
 @comment share/examples/asterisk/default/vpb.conf
 share/examples/asterisk/openbsd/
+share/examples/asterisk/openbsd/cdr.conf.sample
+@sample ${SYSCONFDIR}/asterisk/cdr.conf
 share/examples/asterisk/openbsd/extensions.ael.sample
 @mode 640
 @owner root
@@ -987,6 +989,13 @@ share/examples/asterisk/openbsd/extensions.ael.sample
 @owner
 @group
 share/examples/asterisk/openbsd/extensions.conf.sample
+@mode 640
+@owner root
+@group _asterisk
+@sample ${SYSCONFDIR}/asterisk/extensions.conf
+@mode
+@owner
+@group
 share/examples/asterisk/openbsd/logger.conf.sample
 @sample ${SYSCONFDIR}/asterisk/logger.conf
 share/examples/asterisk/openbsd/modules.conf.sample