diff --git a/net/mldonkey/stable/Makefile b/net/mldonkey/stable/Makefile
index 50dd59406ae..8065e7687e5 100644
--- a/net/mldonkey/stable/Makefile
+++ b/net/mldonkey/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2005/09/10 17:29:58 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2006/02/21 09:49:02 espie Exp $
 
 COMMENT='e-donkey client'
 CATEGORIES=net
@@ -10,8 +10,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
-WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m z pthread
-CONFIGURE_STYLE=	gnu
+WANTLIB=		X11 Xext Xi c glib gmodule iconv intl m z pthread \
+			freetype png jpeg charset
+CONFIGURE_STYLE=	autoconf no-autoheader
+AUTOCONF_DIR=		${WRKSRC}/config
+AUTOCONF_VERSION=	2.59
 #CONFIGURE_ARGS+=	--enable-ocamlver=3.07
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
 
@@ -19,14 +22,19 @@ HOMEPAGE=http://savannah.nongnu.org/projects/mldonkey/
 
 MASTER_SITES=http://savannah.nongnu.org/download/mldonkey/
 DISTNAME=mldonkey-2.6.3
-PKGNAME=${DISTNAME}p0
+PKGNAME=${DISTNAME}p1
 EXTRACT_SUFX=.tar.bz2
 
 CONFIGURE_ARGS+=--enable-gui=newgui1
+CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include'
+CONFIGURE_ENV+=LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
+
 USE_GMAKE=Yes
 MODULES=lang/ocaml
 BUILD_DEPENDS=::x11/lablgtk
-LIB_DEPENDS=gdk.1,gtk.1::x11/gtk+
+LIB_DEPENDS=gdk.1,gtk.1::x11/gtk+ \
+		bz2::archivers/bzip2 \
+		gd::graphics/gd
 FAKE_FLAGS=prefix=${DESTDIR}${PREFIX} MODOCAML_NATIVE=${MODOCAML_NATIVE}
 NO_REGRESS=Yes
 
diff --git a/net/mldonkey/stable/patches/patch-config_Makefile_in b/net/mldonkey/stable/patches/patch-config_Makefile_in
index 55c076c6da9..92339d692fa 100644
--- a/net/mldonkey/stable/patches/patch-config_Makefile_in
+++ b/net/mldonkey/stable/patches/patch-config_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_Makefile_in,v 1.2 2005/05/16 18:49:13 espie Exp $
---- config/Makefile.in.orig	Sun Feb 20 03:31:43 2005
-+++ config/Makefile.in	Mon May 16 20:30:53 2005
-@@ -725,6 +725,8 @@ uninstall::
+$OpenBSD: patch-config_Makefile_in,v 1.3 2006/02/21 09:49:02 espie Exp $
+--- config/Makefile.in.orig	Sun Aug 21 15:17:44 2005
++++ config/Makefile.in	Tue Feb 21 01:06:16 2006
+@@ -792,6 +792,8 @@ uninstall::
  	rm -f $(BINDIR)/mlnet
  	rm -f $(BINDIR)/mlgui
  
@@ -10,7 +10,7 @@ $OpenBSD: patch-config_Makefile_in,v 1.2 2005/05/16 18:49:13 espie Exp $
  install:: opt 
  	mkdir -p $(prefix)/bin
  	if test -f mlnet; then \
-@@ -747,6 +749,22 @@ install:: opt 
+@@ -814,6 +816,22 @@ install:: opt 
               rm -f $(prefix)/bin/mlim; cp -f mlim $(prefix)/bin/mlim; \
           fi
  
@@ -31,5 +31,5 @@ $OpenBSD: patch-config_Makefile_in,v 1.2 2005/05/16 18:49:13 espie Exp $
 +
 +endif
  
- ifeq ("$(COMPILE_GUI)" , "yes")
- 
+ ifneq ("$(GUI)" , "no")
+   ifeq ("$(GUI)", "newgui2")
diff --git a/net/mldonkey/stable/patches/patch-config_configure_in b/net/mldonkey/stable/patches/patch-config_configure_in
new file mode 100644
index 00000000000..bbe1581f8b8
--- /dev/null
+++ b/net/mldonkey/stable/patches/patch-config_configure_in
@@ -0,0 +1,25 @@
+$OpenBSD: patch-config_configure_in,v 1.1 2006/02/21 09:49:02 espie Exp $
+--- config/configure.in.orig	Sun Aug 21 21:39:12 2005
++++ config/configure.in	Tue Feb 21 01:25:28 2006
+@@ -1098,10 +1098,10 @@ GD_PNG=no
+ if test "$GD" != "no"; then
+   GD=no
+   LIBGD=no
+-  AC_CHECK_LIB(gd, gdImageCreate , [LIBGD=yes])
++  AC_CHECK_LIB(gd, gdImageCreate , [LIBGD=yes],, -lfreetype -lfontconfig)
+   if test "$LIBGD" = "yes"; then
+     LIBPNG=no
+-    AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes])
++    AC_CHECK_LIB(png, png_create_read_struct , [LIBPNG=yes],, -lz -lm)
+     LIBGD_PNG=no
+     AC_CHECK_LIB(gd, gdImagePng, [LIBGD_PNG=yes])
+     if test "$LIBPNG" = "no"; then
+@@ -1111,7 +1111,7 @@ if test "$GD" != "no"; then
+         GD=yes
+         HAS_GD_PNG=true
+ 	GD_PNG=yes
+-	AC_CHECK_LIB(png, png_access_version_number,[AC_DEFINE(HAVE_PNGVERSION, 1,)])
++	AC_CHECK_LIB(png, png_access_version_number,[AC_DEFINE(HAVE_PNGVERSION, 1,)],, -lz -lm)
+         AC_DEFINE(HAVE_GD_PNG, 1, [Define to 1 if you have png support in libgd.])
+         AC_MSG_NOTICE(using png support in libgd)
+       else