diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 9e9f951dc3b..24445842cf3 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 1999/02/09 17:08:53 rohee Exp $
+# $OpenBSD: Makefile,v 1.2 1999/04/03 13:39:01 rohee Exp $
 #
 # Amaya, the W3C http://www.w3.org browser
 #
@@ -14,10 +14,12 @@ MAINTAINER	= rohee@OpenBSD.ORG
 MASTER_SITES	= ftp://ftp.w3.org/pub/amaya/ \
                   ftp://ftp-eu.w3.org/pub/amaya/
 
-NEED_VERSION	= 1.60
+NEED_VERSION	= 1.80
 
 USE_MOTIF	= yes
 
+#SEPARATE_BUILD=	concurrent
+
 WRKSRC		= ${WRKDIR}/Thot
 WRKBUILD	= ${WRKSRC}/obj
 
@@ -26,8 +28,8 @@ GNU_CONFIGURE	= yes
 USE_GMAKE	= yes
 CONFIGURE_ARGS	= -with-amaya
 
-#get rid of -g, really too big
-post-configure:
+do-configure:
+	${MKDIR} ${WRKBUILD} && cd ${WRKBUILD} && ../configure ${CONFIGURE_ARGS}
 	${SED} 's/^CFLAGS.*$\/CFLAGS = -O2/' ${WRKBUILD}/Options.orig >${WRKBUILD}/Options
 
 .include <bsd.port.mk>
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index aef08d65e28..bd62b02f0bf 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,13 +1,11 @@
-This one is due to the strange build process for amaya
-
---- Makefile.in.orig	Wed Feb  3 21:44:06 1999
-+++ Makefile.in	Wed Feb  3 21:44:12 1999
-@@ -170,7 +170,7 @@
- 	@(localdir=`pwd` ; libwwwdir="$(THOTDIR)/$(LIBWWW)" ; cd $(LIBWWW) ; \
- 	  unset LANG; \
- 	  if [ ! -x Makefile ] ; then \
--	  	../$$libwwwdir/configure --disable-shared \
-+	  	$$libwwwdir/configure --disable-shared \
- 			-with-zlib="$$localdir/libz.a"; \
- 	  fi)
- 	@(cd $(LIBWWW)/Library/src ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)")
+--- amaya/Makefile.in.orig	Fri Apr  2 22:26:51 1999
++++ amaya/Makefile.in	Fri Apr  2 22:27:31 1999
+@@ -15,7 +15,7 @@
+ 	  $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) $(AMAYA_ILU_LIBS) \
+           -L../tablelib -L../thotlib -L.. -lThotTable -lThotEditor \
+           $(AMAYA_OPTION_EXTRA_LIBS) $(IMGLIBS) \
+-	  $(MOTIF_LIBRARIES) $(XMLIB) $(X_LIBS) -lXt $(X_PRE_LIBS) \
++	  -L/usr/X11R6/lib -lXm -lXt $(X_PRE_LIBS) \
+ 	  -lXext -lX11 $(X_EXTRA_LIBS) @LIBS@ @EXTRA_LIBS@ -lm
+ 
+ CONFIGFILES=XKeysymDB thot.ini amaya.keyboard \