diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile
index 1f23efb0293..202689c1f02 100644
--- a/net/mldonkey/Makefile
+++ b/net/mldonkey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2003/06/17 16:36:05 lebel Exp $
+# $OpenBSD: Makefile,v 1.3 2003/06/29 07:57:18 sturm Exp $
 
 COMMENT='e-donkey client'
 CATEGORIES=net
@@ -16,13 +16,14 @@ HOMEPAGE=http://savannah.nongnu.org/projects/mldonkey/
 
 MASTER_SITES=http://savannah.nongnu.org/download/mldonkey/release-2.5-3/official/
 DISTNAME=mldonkey-2.5.3
+PKGNAME=${DISTNAME}p0
 DISTFILES=mldonkey-2.5-3.sources.tar.gz
 WRKDIST=${WRKDIR}/mldonkey-2.5-3
 
 USE_GMAKE=Yes
 MODULES=ocaml
 BUILD_DEPENDS=::x11/lablgtk
-FAKE_FLAGS=prefix=${DESTDIR}${PREFIX}
+FAKE_FLAGS=prefix=${DESTDIR}${PREFIX} MODOCAML_NATIVE=${MODOCAML_NATIVE}
 
 post-install:
 	mkdir -p ${PREFIX}/share/mldonkey
diff --git a/net/mldonkey/patches/patch-config_Makefile_in b/net/mldonkey/patches/patch-config_Makefile_in
new file mode 100644
index 00000000000..05383062c20
--- /dev/null
+++ b/net/mldonkey/patches/patch-config_Makefile_in
@@ -0,0 +1,48 @@
+$OpenBSD: patch-config_Makefile_in,v 1.1 2003/06/29 07:57:18 sturm Exp $
+--- config/Makefile.in.orig	Thu Jun  5 09:32:27 2003
++++ config/Makefile.in	Tue Jun 24 23:18:49 2003
+@@ -450,6 +450,8 @@ uninstall::
+ 	rm -f $(BINDIR)/mlnet
+ 	rm -f $(BINDIR)/mlgui
+ 
++ifeq ("$(MODOCAML_NATIVE)", "Yes")
++
+ install:: opt 
+ 	mkdir -p $(prefix)/bin
+ 	if test -e mlnet; then \
+@@ -459,7 +461,7 @@ install:: opt 
+              done; \
+          fi
+ 	if test -e mlgui; then \
+-             rm -f $(prefix)/bin/mlgui; cp -f mlnet $(prefix)/bin/mlgui; \
++             rm -f $(prefix)/bin/mlgui; cp -f mlgui $(prefix)/bin/mlgui; \
+              rm -f $(prefix)/bin/mldonkey_gui; cp -f mlgui $(prefix)/bin/mldonkey_gui; \
+          fi
+ 	if test -e mlnet+gui; then \
+@@ -469,9 +471,25 @@ install:: opt 
+              done; \
+          fi
+ 	if test -e mlim; then \
+-             rm -f $(prefix)/bin/mlim; cp -f mlnet $(prefix)/bin/mlim; \
++             rm -f $(prefix)/bin/mlim; cp -f mlim $(prefix)/bin/mlim; \
+          fi
+ 
++else
++
++install::
++	cp -f mlnet.byte $(prefix)/bin/mlnet
++	for link in mlslsk mldonkey mlgnut mldc mlbt; do \
++	  ln -s mlnet $(prefix)/bin/$$link; \
++	done
++	cp -f mlgui.byte $(prefix)/bin/mlgui
++	cp -f mlgui.byte $(prefix)/bin/mldonkey_gui
++	cp -f mlnet.byte $(prefix)/bin/mlnet+gui
++	for link in mlslsk+gui mldonkey+gui mlgnut+gui mldc+gui mlbt+gui; do \
++	  ln -s mlnet+gui $(prefix)/bin/$$link; \
++	done
++	cp -f mlim.byte $(prefix)/bin/mlim;
++
++endif
+ 
+ ifeq ("$(COMPILE_GUI)" , "yes")
+