diff --git a/telephony/siproxd/Makefile b/telephony/siproxd/Makefile
index af8ccc15183..74eba06b037 100644
--- a/telephony/siproxd/Makefile
+++ b/telephony/siproxd/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/06/29 21:15:24 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2006/11/27 11:16:50 msf Exp $
 
 COMMENT=	"proxy/masquerading daemon for the SIP protocol"
 
-DISTNAME=	siproxd-0.5.11
+DISTNAME=	siproxd-0.5.13
 CATEGORIES=	telephony net
 
 HOMEPAGE=	http://siproxd.sourceforge.net/
 
-MAINTAINER=	Markus Friedl <markus@openbsd.org> 
+MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/telephony/siproxd/distinfo b/telephony/siproxd/distinfo
index 2949911f52c..ea69cce522c 100644
--- a/telephony/siproxd/distinfo
+++ b/telephony/siproxd/distinfo
@@ -1,4 +1,4 @@
-MD5 (siproxd-0.5.11.tar.gz) = a614f60683f9ea9423573bc5d646c525
-RMD160 (siproxd-0.5.11.tar.gz) = ef9fc14421c64d42a131a53627391b2fab934465
-SHA1 (siproxd-0.5.11.tar.gz) = b1fb295cd8194d743f98dd3c5c5976ed6bcd96ab
-SIZE (siproxd-0.5.11.tar.gz) = 216684
+MD5 (siproxd-0.5.13.tar.gz) = 91a572f80dd5a9af5a0f7f207fd34478
+RMD160 (siproxd-0.5.13.tar.gz) = c5917e47655aa363d6c72ab5a0836cdef002b39a
+SHA1 (siproxd-0.5.13.tar.gz) = 108ce97037e119c0910e1b49e36584972dcd6ccb
+SIZE (siproxd-0.5.13.tar.gz) = 223109
diff --git a/telephony/siproxd/patches/patch-doc_siproxd_conf_example b/telephony/siproxd/patches/patch-doc_siproxd_conf_example
new file mode 100644
index 00000000000..66d6f76521a
--- /dev/null
+++ b/telephony/siproxd/patches/patch-doc_siproxd_conf_example
@@ -0,0 +1,31 @@
+$OpenBSD: patch-doc_siproxd_conf_example,v 1.1 2006/11/27 11:16:50 msf Exp $
+--- doc/siproxd.conf.example.orig	Mon Jun 19 01:28:42 2006
++++ doc/siproxd.conf.example	Sun Nov 26 00:15:43 2006
+@@ -80,15 +80,15 @@ log_calls = 1
+ # Secure Enviroment settings:
+ #   user:	uid/gid to switch to after startup
+ #   chrootjail:	path to chroot to (chroot jail)
+-user = nobody
+-#chrootjail = /var/lib/siproxd/
++user = _siproxd
++chrootjail = /var/siproxd/
+ 
+ ######################################################################
+ # Registration file:
+ #   Where to store the current registrations.
+ #   An empty value means we do not save registrations. Make sure that
+ #   the specified directory path does exist!
+-registration_file = /var/lib/siproxd/siproxd_registrations
++registration_file = siproxd_registrations
+ 
+ ######################################################################
+ # Automatically save current registrations every 'n' seconds
+@@ -99,7 +99,7 @@ autosave_registrations = 300
+ # PID file:
+ #   Where to create the PID file.
+ #   This file holds the PID of the main thread of siproxd.
+-pid_file = /var/run/siproxd/siproxd.pid
++pid_file = siproxd.pid
+ 
+ ######################################################################
+ # global switch to control the RTP proxy behaviour
diff --git a/telephony/siproxd/patches/patch-src_Makefile_in b/telephony/siproxd/patches/patch-src_Makefile_in
index 3fb968cb391..2eaf5f7ffe8 100644
--- a/telephony/siproxd/patches/patch-src_Makefile_in
+++ b/telephony/siproxd/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2005/06/29 21:15:24 sturm Exp $
---- src/Makefile.in.orig	Wed Jun 29 22:55:19 2005
-+++ src/Makefile.in	Wed Jun 29 22:59:37 2005
-@@ -501,7 +501,7 @@ uninstall-am: uninstall-info-am uninstal
+$OpenBSD: patch-src_Makefile_in,v 1.2 2006/11/27 11:16:50 msf Exp $
+--- src/Makefile.in.orig	Mon Jun 19 01:29:03 2006
++++ src/Makefile.in	Sat Nov 25 23:57:50 2006
+@@ -506,7 +506,7 @@ uninstall-am: uninstall-info-am uninstal
  # count BUILDs - each time increment by one and define the
  # C macro BUILDNO. bind it to a file everybody includes (log.h)
  #
diff --git a/telephony/siproxd/pkg/PLIST b/telephony/siproxd/pkg/PLIST
index 071f4712bd2..0bedff18e79 100644
--- a/telephony/siproxd/pkg/PLIST
+++ b/telephony/siproxd/pkg/PLIST
@@ -1,8 +1,16 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/06/29 21:15:24 sturm Exp $
+@comment $OpenBSD: PLIST,v 1.2 2006/11/27 11:16:50 msf Exp $
+@newgroup _siproxd:574
+@newuser _siproxd:574:574:daemon:SIP proxy:/var/empty:/sbin/nologin
 sbin/siproxd
 share/doc/siproxd/
 share/doc/siproxd/FAQ
 share/doc/siproxd/KNOWN_BUGS
 share/examples/siproxd/
 share/examples/siproxd/siproxd.conf.example
+@sample ${SYSCONFDIR}/siproxd.conf
 share/examples/siproxd/siproxd_passwd.cfg
+@sample ${SYSCONFDIR}/siproxd_passwd.cfg
+@owner root
+@group _siproxd
+@mode 0770
+@sample /var/siproxd/