diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 8bcafb69f9c4..ae8a41e5e269 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://web.wt.net/~dblhack/ \
 
 MAINTAINER=	dirk@FreeBSD.org
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS=	forms.0:${PORTSDIR}/x11-toolkits/xforms \
 		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_X_PREFIX=	yes
diff --git a/databases/xmysql/files/patch-aa b/databases/xmysql/files/patch-aa
index df3bfc84697b..7f04af94381d 100644
--- a/databases/xmysql/files/patch-aa
+++ b/databases/xmysql/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Oct 23 03:35:51 1998
-+++ Makefile	Fri Dec 25 14:53:40 1998
+--- Makefile.orig	Wed Nov 18 05:19:06 1998
++++ Makefile	Sun Mar 11 13:59:59 2001
 @@ -31,24 +31,23 @@
  PROGRAM = 	xmysql
  
@@ -43,8 +43,7 @@
  ${PROGRAM}: $(OBJS)
  	$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
  	$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
--	$(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
-+	$(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm -lm
+ 	$(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
  
  .c.o:
 -	$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 128bf6690362..7c30d512f3f9 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.mysql.com/Downloads/Contrib/ \
 
 MAINTAINER=	dirk@FreeBSD.org
 
-LIB_DEPENDS=	xforms.0:${PORTSDIR}/x11-toolkits/xforms \
+LIB_DEPENDS=	forms.0:${PORTSDIR}/x11-toolkits/xforms \
 		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 USE_X_PREFIX=	yes
diff --git a/databases/xmysqladmin/files/patch-aa b/databases/xmysqladmin/files/patch-aa
index 53d21c7528f4..5794ccd10aa7 100644
--- a/databases/xmysqladmin/files/patch-aa
+++ b/databases/xmysqladmin/files/patch-aa
@@ -1,5 +1,5 @@
 --- Makefile.orig	Mon Dec  7 12:52:39 1998
-+++ Makefile	Thu Jul  1 16:43:57 1999
++++ Makefile	Sun Mar 11 14:02:11 2001
 @@ -34,7 +34,7 @@
  # This is used by 'make install' command
  #-------------------------------------------------------
@@ -88,7 +88,7 @@
  	$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
 -	$(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS)
 -	./$(PROGRAM)
-+	$(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm $(LIBS)
++	$(XLOAD) $(XFORMLIBDIR) -lforms -lXpm $(LIBS)
  
  .c.o:
  	$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC)