diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index 902933288aa..ed84fb3d09a 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2009/06/23 22:47:23 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2009/07/12 20:01:32 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT-main=	multi-protocol instant messaging client
 COMMENT-finch=	multi-protocol instant messaging client, console client
 COMMENT-libpurple= multi-protocol instant messaging library
 
-VERSION=	2.5.7
+VERSION=	2.5.8
 DISTNAME=	pidgin-${VERSION}
 PKGNAME=	pidgin-${VERSION}
 PKGNAME-main=	pidgin-${VERSION}
diff --git a/net/pidgin/distinfo b/net/pidgin/distinfo
index 08781caa2b7..9586482b484 100644
--- a/net/pidgin/distinfo
+++ b/net/pidgin/distinfo
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.5.7.tar.gz) = idOKncQOaQ/zS/lTkeaYAQ==
-RMD160 (pidgin-2.5.7.tar.gz) = KU6H1Jv2bevsNEu4p/venCgLtPc=
-SHA1 (pidgin-2.5.7.tar.gz) = rzdYjmq3pVC7ne5wAoPUGd5lxZQ=
-SHA256 (pidgin-2.5.7.tar.gz) = 6UWlgYgjD4kcdqCJ8TT5bA6PjhUl56kZn1CWGqUvuwQ=
-SIZE (pidgin-2.5.7.tar.gz) = 11978116
+MD5 (pidgin-2.5.8.tar.gz) = v4IV2Fp6sLwcmdvW2Dk39g==
+RMD160 (pidgin-2.5.8.tar.gz) = JvE0vBPeL00/asEvSWjj7KBAc5g=
+SHA1 (pidgin-2.5.8.tar.gz) = cEXD4cxNYh1AkBDnbV+NDRlxgp8=
+SHA256 (pidgin-2.5.8.tar.gz) = GsF/TPJuanydJ/ebCPwGfLlAIWXQoNzy3zavAF892fw=
+SIZE (pidgin-2.5.8.tar.gz) = 11828118
diff --git a/net/pidgin/patches/patch-config_h_in b/net/pidgin/patches/patch-config_h_in
index 76ee08c5e34..776fc54ec26 100644
--- a/net/pidgin/patches/patch-config_h_in
+++ b/net/pidgin/patches/patch-config_h_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_h_in,v 1.10 2009/03/05 06:23:04 steven Exp $
---- config.h.in.orig	Sun Mar  1 21:33:50 2009
-+++ config.h.in	Mon Mar  2 02:09:11 2009
-@@ -193,6 +193,12 @@
+$OpenBSD: patch-config_h_in,v 1.11 2009/07/12 20:01:32 sthen Exp $
+--- config.h.in.orig	Sat Jun 27 22:12:40 2009
++++ config.h.in	Mon Jun 29 22:43:21 2009
+@@ -196,6 +196,12 @@
  /* Define to 1 if you have the <nss.h> header file. */
  #undef HAVE_NSS_H
  
diff --git a/net/pidgin/patches/patch-finch_libgnt_Makefile_in b/net/pidgin/patches/patch-finch_libgnt_Makefile_in
index c5ed9e96977..067a40eb065 100644
--- a/net/pidgin/patches/patch-finch_libgnt_Makefile_in
+++ b/net/pidgin/patches/patch-finch_libgnt_Makefile_in
@@ -1,9 +1,9 @@
-$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.15 2009/06/23 22:47:23 sthen Exp $
---- finch/libgnt/Makefile.in.orig	Sat Jun 20 18:35:21 2009
-+++ finch/libgnt/Makefile.in	Sun Jun 21 21:45:51 2009
-@@ -459,7 +459,7 @@ target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
+$OpenBSD: patch-finch_libgnt_Makefile_in,v 1.16 2009/07/12 20:01:32 sthen Exp $
+--- finch/libgnt/Makefile.in.orig	Sat Jun 27 22:12:41 2009
++++ finch/libgnt/Makefile.in	Mon Jun 29 22:43:21 2009
+@@ -358,7 +358,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  EXTRA_DIST = genmarshal
 -SUBDIRS = . wms
 +SUBDIRS = .
diff --git a/net/pidgin/patches/patch-finch_plugins_Makefile_in b/net/pidgin/patches/patch-finch_plugins_Makefile_in
index 04924f248c3..1217f103b09 100644
--- a/net/pidgin/patches/patch-finch_plugins_Makefile_in
+++ b/net/pidgin/patches/patch-finch_plugins_Makefile_in
@@ -1,9 +1,9 @@
-$OpenBSD: patch-finch_plugins_Makefile_in,v 1.15 2009/06/23 22:47:23 sthen Exp $
---- finch/plugins/Makefile.in.orig	Sat Jun 20 18:35:22 2009
-+++ finch/plugins/Makefile.in	Sun Jun 21 21:45:51 2009
-@@ -76,7 +76,8 @@ am__gnthistory_la_SOURCES_DIST = gnthistory.c
- @PLUGINS_TRUE@am_gnthistory_la_OBJECTS = gnthistory.lo
- gnthistory_la_OBJECTS = $(am_gnthistory_la_OBJECTS)
+$OpenBSD: patch-finch_plugins_Makefile_in,v 1.16 2009/07/12 20:01:32 sthen Exp $
+--- finch/plugins/Makefile.in.orig	Sat Jun 27 22:12:42 2009
++++ finch/plugins/Makefile.in	Mon Jun 29 22:43:21 2009
+@@ -81,7 +81,8 @@ gnthistory_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(gnthistory_la_LDFLAGS) $(LDFLAGS) -o $@
  @PLUGINS_TRUE@am_gnthistory_la_rpath = -rpath $(plugindir)
 -@PLUGINS_TRUE@gntlastlog_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 +@PLUGINS_TRUE@gntlastlog_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -11,7 +11,7 @@ $OpenBSD: patch-finch_plugins_Makefile_in,v 1.15 2009/06/23 22:47:23 sthen Exp $
  am__gntlastlog_la_SOURCES_DIST = lastlog.c
  @PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
  gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
-@@ -492,7 +493,7 @@ grouping_la_LDFLAGS = -module -avoid-version
+@@ -400,7 +401,7 @@ grouping_la_LDFLAGS = -module -avoid-version
  @PLUGINS_TRUE@gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
  @PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
  @PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)
diff --git a/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in b/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
index aa005695be6..c759fe9333d 100644
--- a/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
+++ b/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sthen Exp $
---- libpurple/plugins/ssl/Makefile.in.orig	Sat Jun 20 18:35:25 2009
-+++ libpurple/plugins/ssl/Makefile.in	Sun Jun 21 21:45:51 2009
-@@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
+$OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.16 2009/07/12 20:01:32 sthen Exp $
+--- libpurple/plugins/ssl/Makefile.in.orig	Sat Jun 27 22:12:43 2009
++++ libpurple/plugins/ssl/Makefile.in	Mon Jun 29 22:43:21 2009
+@@ -53,6 +53,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
  pluginLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(plugin_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -14,8 +14,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sth
  @PLUGINS_TRUE@ssl_gnutls_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
  @PLUGINS_TRUE@	$(am__DEPENDENCIES_1)
  am__ssl_gnutls_la_SOURCES_DIST = ssl-gnutls.c
-@@ -107,7 +113,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CF
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+@@ -113,7 +119,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOO
+ 	$(LDFLAGS) -o $@
  SOURCES = $(ssl_gnutls_la_SOURCES) $(ssl_nss_la_SOURCES) \
  	$(ssl_la_SOURCES)
 -DIST_SOURCES = $(am__ssl_gnutls_la_SOURCES_DIST) \
@@ -23,7 +23,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sth
  	$(am__ssl_nss_la_SOURCES_DIST) $(am__ssl_la_SOURCES_DIST)
  ETAGS = etags
  CTAGS = ctags
-@@ -221,6 +227,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
+@@ -177,6 +183,8 @@ GNT_MAJOR_VERSION = @GNT_MAJOR_VERSION@
  GNT_MICRO_VERSION = @GNT_MICRO_VERSION@
  GNT_MINOR_VERSION = @GNT_MINOR_VERSION@
  GNT_VERSION = @GNT_VERSION@
@@ -32,7 +32,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sth
  GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
  GNUTLS_LIBS = @GNUTLS_LIBS@
  GREP = @GREP@
-@@ -478,6 +486,7 @@ EXTRA_DIST = \
+@@ -380,6 +388,7 @@ EXTRA_DIST = \
  
  plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
  ssl_la_LDFLAGS = -module -avoid-version
@@ -40,7 +40,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sth
  ssl_gnutls_la_LDFLAGS = -module -avoid-version
  ssl_nss_la_LDFLAGS = -module -avoid-version
  @PLUGINS_TRUE@@USE_GNUTLS_FALSE@@USE_NSS_FALSE@plugin_LTLIBRARIES = \
-@@ -491,19 +500,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
+@@ -393,19 +402,25 @@ ssl_nss_la_LDFLAGS = -module -avoid-version
  @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@	ssl.la           \
  @PLUGINS_TRUE@@USE_GNUTLS_TRUE@@USE_NSS_FALSE@	ssl-gnutls.la
  
@@ -66,7 +66,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sth
  @PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
  @PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
  AM_CPPFLAGS = \
-@@ -515,6 +530,7 @@ AM_CPPFLAGS = \
+@@ -417,6 +432,7 @@ AM_CPPFLAGS = \
  	$(GLIB_CFLAGS) \
  	$(PLUGIN_CFLAGS)
  
@@ -74,16 +74,16 @@ $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.15 2009/06/23 22:47:23 sth
  ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
  ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
  all: all-am
-@@ -577,6 +593,8 @@ clean-pluginLTLIBRARIES:
+@@ -479,6 +495,8 @@ clean-pluginLTLIBRARIES:
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
 +ssl-openssl.la: $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_DEPENDENCIES)
 +	$(LINK) $(am_ssl_openssl_la_rpath) $(ssl_openssl_la_LDFLAGS) $(ssl_openssl_la_OBJECTS) $(ssl_openssl_la_LIBADD) $(LIBS)
  ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES) 
- 	$(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
+ 	$(ssl_gnutls_la_LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
  ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES) 
-@@ -591,6 +609,7 @@ distclean-compile:
+@@ -493,6 +511,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
diff --git a/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in b/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in
index 78454ab63bc..38e395d7026 100644
--- a/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in
+++ b/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.15 2009/06/23 22:47:23 sthen Exp $
---- libpurple/protocols/gg/Makefile.in.orig	Sat Jun 20 18:35:27 2009
-+++ libpurple/protocols/gg/Makefile.in	Sun Jun 21 21:45:51 2009
-@@ -508,7 +508,7 @@ libgg_la_LDFLAGS = -module -avoid-version
+$OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.16 2009/07/12 20:01:32 sthen Exp $
+--- libpurple/protocols/gg/Makefile.in.orig	Sat Jun 27 22:12:44 2009
++++ libpurple/protocols/gg/Makefile.in	Mon Jun 29 22:43:21 2009
+@@ -404,7 +404,7 @@ libgg_la_LDFLAGS = -module -avoid-version
  @STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)
  @STATIC_GG_TRUE@libgg_la_SOURCES = $(GGSOURCES)
  @STATIC_GG_TRUE@libgg_la_CFLAGS = $(AM_CFLAGS)
diff --git a/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in b/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in
index a39c9543d7e..7a95ef96f30 100644
--- a/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in
+++ b/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.15 2009/06/23 22:47:23 sthen Exp $
---- libpurple/protocols/oscar/Makefile.in.orig	Sat Jun 20 18:35:31 2009
-+++ libpurple/protocols/oscar/Makefile.in	Sun Jun 21 21:45:51 2009
-@@ -539,9 +539,9 @@ libicq_la_LDFLAGS = -module -avoid-version
+$OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.16 2009/07/12 20:01:32 sthen Exp $
+--- libpurple/protocols/oscar/Makefile.in.orig	Sat Jun 27 22:12:46 2009
++++ libpurple/protocols/oscar/Makefile.in	Mon Jun 29 22:43:21 2009
+@@ -441,9 +441,9 @@ libicq_la_LDFLAGS = -module -avoid-version
  @STATIC_OSCAR_FALSE@pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la
  @STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
  @STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c
diff --git a/net/pidgin/patches/patch-pidgin_Makefile_in b/net/pidgin/patches/patch-pidgin_Makefile_in
index faf28bcfb04..1f68636ddca 100644
--- a/net/pidgin/patches/patch-pidgin_Makefile_in
+++ b/net/pidgin/patches/patch-pidgin_Makefile_in
@@ -1,12 +1,12 @@
-$OpenBSD: patch-pidgin_Makefile_in,v 1.7 2008/10/23 02:55:44 brad Exp $
---- pidgin/Makefile.in.orig	Sun Oct 19 10:38:13 2008
-+++ pidgin/Makefile.in	Tue Oct 21 20:19:24 2008
-@@ -109,7 +109,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
- LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- 	$(AM_CFLAGS) $(CFLAGS)
+$OpenBSD: patch-pidgin_Makefile_in,v 1.8 2009/07/12 20:01:32 sthen Exp $
+--- pidgin/Makefile.in.orig	Sat Jun 27 22:12:48 2009
++++ pidgin/Makefile.in	Mon Jun 29 22:47:25 2009
+@@ -108,7 +108,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 -CCLD = $(CC)
 +CCLD = $(CXX)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- SOURCES = $(pidgin_SOURCES)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
diff --git a/net/pidgin/pkg/PLIST-libpurple b/net/pidgin/pkg/PLIST-libpurple
index 365149262c8..e3c3d2a61f2 100644
--- a/net/pidgin/pkg/PLIST-libpurple
+++ b/net/pidgin/pkg/PLIST-libpurple
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-libpurple,v 1.2 2009/06/17 02:08:35 sthen Exp $
+@comment $OpenBSD: PLIST-libpurple,v 1.3 2009/07/12 20:01:32 sthen Exp $
 @conflict pidgin-<2.5.6p3
 @pkgpath net/pidgin
 @bin bin/purple-client-example
@@ -87,6 +87,8 @@ lib/purple-2/joinpart.la
 lib/purple-2/joinpart.so
 lib/purple-2/libaim.la
 lib/purple-2/libaim.so
+@comment lib/purple-2/libbonjour.la
+@comment lib/purple-2/libbonjour.so
 lib/purple-2/libgg.la
 lib/purple-2/libgg.so
 lib/purple-2/libicq.la