diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index e2d4d198422..fa573492a70 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.52 2010/04/01 22:16:29 naddy Exp $
+# $OpenBSD: Makefile,v 1.53 2010/05/01 13:50:05 naddy Exp $
 
 COMMENT-main=	lightweight BitTorrent command line and daemon client
 COMMENT-gui=	lightweight BitTorrent client with graphical interface
 
 VER=		1.92
 DISTNAME=	transmission-${VER}
-PKGNAME-main=	transmission-${VER}
-PKGNAME-gui=	transmission-gui-${VER}p0
+PKGNAME-main=	transmission-${VER}p0
+PKGNAME-gui=	transmission-gui-${VER}p1
 CATEGORIES=	net
 HOMEPAGE=	http://www.transmissionbt.com/
 
@@ -26,11 +26,12 @@ FLAVOR?=
 
 MULTI_PACKAGES=	-main
 
-WANTLIB=	c crypto idn m pthread ssl z
+WANTLIB=	c crypto event idn m pthread ssl z
 WANTLIB-main=	${WANTLIB}
 
 MODULES=	devel/gettext textproc/intltool
-LIB_DEPENDS=	curl.>=14::net/curl
+LIB_DEPENDS=	curl.>=14::net/curl \
+		eventextra.>=1::devel/libeventextra
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
@@ -48,7 +49,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lcrypto"
 LIBTOOL_FLAGS=	--tag=disable-shared
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/third-party/libevent
+MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}
 
 .if ${FLAVOR:L:Mno_gui}
 CONFIGURE_ARGS+=--disable-gtk
@@ -58,11 +59,13 @@ WANTLIB-gui=	${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 		Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo dbus-1 \
 		expat fontconfig freetype gio-2.0 glib-2.0 glitz \
 		gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 pangoft2-1.0 \
-		pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb
+		pangocairo-1.0 pixman-1 png pcre pthread-stubs xcb \
+		xcb-render xcb-render-util
 LIB_DEPENDS+=	gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
 		dbus-glib-1::x11/dbus-glib
 LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
-		curl.>=13::net/curl
+		curl.>=14::net/curl \
+		eventextra.>=1::devel/libeventextra
 RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main \
 		::devel/desktop-file-utils \
 		:gamin-*:sysutils/gamin,-server,no_python
diff --git a/net/transmission/patches/patch-configure_ac b/net/transmission/patches/patch-configure_ac
index e5407fe1828..feccc264b83 100644
--- a/net/transmission/patches/patch-configure_ac
+++ b/net/transmission/patches/patch-configure_ac
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.2 2010/04/21 06:57:24 sthen Exp $
---- configure.ac.orig	Fri Mar 12 02:04:38 2010
-+++ configure.ac	Tue Apr 20 22:42:38 2010
+$OpenBSD: patch-configure_ac,v 1.3 2010/05/01 13:50:05 naddy Exp $
+--- configure.ac.orig	Fri Mar 12 03:04:38 2010
++++ configure.ac	Sat May  1 03:12:59 2010
 @@ -24,8 +24,8 @@ AC_PROG_LIBTOOL
  if test m4_substr(peer_id_prefix,6,1) = "0"; then
    supported_build=yes
@@ -30,7 +30,14 @@ $OpenBSD: patch-configure_ac,v 1.2 2010/04/21 06:57:24 sthen Exp $
      fi
  fi
  
-@@ -211,7 +211,7 @@ AC_CHECK_LIB([event],[evutil_vsnprintf],
+@@ -205,13 +205,13 @@ AC_CHECK_LIB([rt],
+ dnl build our copy of libevent whether we use it or not,
+ dnl because "make dist" needs its Makefiles to exist, and
+ dnl AM_CONDITIONAL + AC_CONFIG_SUBDIRS don't seem to play nice
+-AC_CONFIG_SUBDIRS([third-party/libevent])
++dnl AC_CONFIG_SUBDIRS([third-party/libevent])
+ libevent_source=bundled
+ AC_CHECK_LIB([event],[evutil_vsnprintf],
               [libevent_found=yes],
               [libevent_found=no],
               [$libevent_extra_libs])
@@ -39,6 +46,15 @@ $OpenBSD: patch-configure_ac,v 1.2 2010/04/21 06:57:24 sthen Exp $
                  [libevent_headers_found=yes],
                  [libevent_headers_found=no])
  libevent_source=bundled
+@@ -227,7 +227,7 @@ if test "x$libevent_source" = "xbundled"; then
+     LIBEVENT_LIBS="\$(top_builddir)/third-party/libevent/libevent.la"
+ else
+     LIBEVENT_CFLAGS=""
+-    LIBEVENT_LIBS="-levent $libevent_extra_libs"
++    LIBEVENT_LIBS="-leventextra -levent $libevent_extra_libs"
+ fi
+ AC_ARG_VAR([LIBEVENT_CFLAGS], [C compiler flags for LIBEVENT, overriding pkg-config])dnl
+ AC_ARG_VAR([LIBEVENT_LIBS], [linker flags for LIBEVENT, overriding pkg-config])dnl
 @@ -293,10 +293,13 @@ if test "x$build_gtk" = "xyes"; then
                    AS_HELP_STRING([--enable-libnotify],[enable notifications]),, 
                    [enable_libnotify=yes]) 
diff --git a/net/transmission/patches/patch-third-party_Makefile_in b/net/transmission/patches/patch-third-party_Makefile_in
new file mode 100644
index 00000000000..22e3fe1702d
--- /dev/null
+++ b/net/transmission/patches/patch-third-party_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-third-party_Makefile_in,v 1.1 2010/05/01 13:50:05 naddy Exp $
+--- third-party/Makefile.in.orig	Sat May  1 03:13:20 2010
++++ third-party/Makefile.in	Sat May  1 03:13:31 2010
+@@ -281,7 +281,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ transmissionlocaledir = @transmissionlocaledir@
+-SUBDIRS = libnatpmp miniupnp libevent dht
++SUBDIRS = libnatpmp miniupnp dht
+ EXTRA_DIST = \
+   macosx-libevent-config.h \
+   macosx-libevent-event-config.h