diff --git a/telephony/libosip2/Makefile b/telephony/libosip2/Makefile
index 3049c9bf4ab..3cd17ab5472 100644
--- a/telephony/libosip2/Makefile
+++ b/telephony/libosip2/Makefile
@@ -1,8 +1,16 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/06/29 21:12:31 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2005/12/26 13:13:45 steven Exp $
 
 COMMENT=	"GNU oSIP library"
 
 DISTNAME=	libosip2-2.2.0
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=		osip2		3.0 \
+			osipparser2	3.0
+MODGNU_SHARED_LIBS=	osip2		'' \
+			osipparser2	''
+LIBosip2_ALIAS=		realosip2
+LIBosipparser2_ALIAS=	realosipparser2
+
 CATEGORIES=	telephony devel
 
 HOMEPAGE=	http://www.gnu.org/software/osip/
@@ -17,6 +25,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_GNU:=osip/}
 
+USE_LIBTOOL=	Yes
+
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--disable-debug \
 		--enable-test
diff --git a/telephony/libosip2/patches/patch-scripts_ltmain_sh b/telephony/libosip2/patches/patch-scripts_ltmain_sh
deleted file mode 100644
index e52ec6ac555..00000000000
--- a/telephony/libosip2/patches/patch-scripts_ltmain_sh
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_ltmain_sh,v 1.1.1.1 2005/06/29 21:12:31 sturm Exp $
---- scripts/ltmain.sh.orig	Tue Jun 28 22:59:45 2005
-+++ scripts/ltmain.sh	Tue Jun 28 23:00:01 2005
-@@ -2270,10 +2270,6 @@ EOF
- 	link_static=no # Whether the deplib will be linked statically
- 	if test -n "$library_names" &&
- 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
--	  if test "$installed" = no; then
--	    notinst_deplibs="$notinst_deplibs $lib"
--	    need_relink=yes
--	  fi
- 	  # This is a shared library
- 
- 	  # Warn about portability, can't link against -module's on
diff --git a/telephony/libosip2/patches/patch-src_osip2_Makefile_in b/telephony/libosip2/patches/patch-src_osip2_Makefile_in
new file mode 100644
index 00000000000..32799ba6e28
--- /dev/null
+++ b/telephony/libosip2/patches/patch-src_osip2_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_osip2_Makefile_in,v 1.1 2005/12/26 13:13:46 steven Exp $
+--- src/osip2/Makefile.in.orig	Mon Dec 26 12:41:27 2005
++++ src/osip2/Makefile.in	Mon Dec 26 12:41:51 2005
+@@ -105,7 +105,7 @@ lib_LTLIBRARIES = libosip2.la
+ libosip2_la_SOURCES =  ict_fsm.c      ist_fsm.c      nict_fsm.c          nist_fsm.c    ict.c          ist.c          nict.c              nist.c        fsm_misc.c     osip.c         osip_transaction.c  osip_event.c  port_sema.c    port_fifo.c    port_thread.c       osip_dialog.c osip_negotiation.c            port_condv.c        osip_time.c
+ 
+ 
+-libosip2_la_LDFLAGS = -version-info $(LIBOSIP_SO_VERSION)  $(FSM_LIB) $(EXTRA_LIB) ../osipparser2/libosipparser2.la
++libosip2_la_LDFLAGS = $(librealosip2_la_LDFLAGS) $(FSM_LIB) $(EXTRA_LIB) ../osipparser2/libosipparser2.la
+ 
+ 
+ INCLUDES = -I$(top_srcdir)/include
diff --git a/telephony/libosip2/patches/patch-src_osipparser2_Makefile_in b/telephony/libosip2/patches/patch-src_osipparser2_Makefile_in
new file mode 100644
index 00000000000..71defe95439
--- /dev/null
+++ b/telephony/libosip2/patches/patch-src_osipparser2_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_osipparser2_Makefile_in,v 1.1 2005/12/26 13:13:46 steven Exp $
+--- src/osipparser2/Makefile.in.orig	Mon Dec 26 12:42:58 2005
++++ src/osipparser2/Makefile.in	Mon Dec 26 12:43:22 2005
+@@ -105,7 +105,7 @@ lib_LTLIBRARIES = libosipparser2.la
+ libosipparser2_la_SOURCES = osip_content_encoding.c osip_proxy_authorization.c osip_accept_encoding.c      osip_cseq.c                osip_record_route.c    osip_accept_language.c      osip_accept.c              osip_route.c           osip_alert_info.c           osip_error_info.c          osip_to.c              osip_allow.c                osip_from.c                osip_uri.c             osip_authorization.c        osip_header.c              osip_via.c             osip_body.c                 osip_md5c.c               osip_www_authenticate.c osip_call_info.c            osip_message.c             osip_list.c            osip_call_id.c              osip_message_parse.c                              osip_contact.c              osip_message_to_str.c      osip_port.c            osip_content_disposition.c  osip_mime_version.c        sdp_message.c          osip_content_length.c       osip_parser_cfg.c          sdp_accessor.c         osip_content_type.c         osip_proxy_authenticate.c  osip_rfc3264.c         osip_authentication_info.c  osip_proxy_authentication_info.c
+ 
+ 
+-libosipparser2_la_LDFLAGS = -version-info $(LIBOSIP_SO_VERSION)  $(PARSER_LIB) $(EXTRA_LIB)
++libosipparser2_la_LDFLAGS = $(librealosipparser2_la_LDFLAGS) $(PARSER_LIB) $(EXTRA_LIB)
+ 
+ 
+ INCLUDES = -I$(top_srcdir)/include
diff --git a/telephony/libosip2/pkg/PFRAG.shared b/telephony/libosip2/pkg/PFRAG.shared
index b546b8bf529..b5cf5b09586 100644
--- a/telephony/libosip2/pkg/PFRAG.shared
+++ b/telephony/libosip2/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2005/06/29 21:12:31 sturm Exp $
-@lib lib/libosip2.so.3.0
-@lib lib/libosipparser2.so.3.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2005/12/26 13:13:46 steven Exp $
+@lib lib/libosip2.so.${LIBosip2_VERSION}
+@lib lib/libosipparser2.so.${LIBosipparser2_VERSION}