diff --git a/emulators/xcopilot/Makefile b/emulators/xcopilot/Makefile
index 6003deb56e3..fd99cbfa924 100644
--- a/emulators/xcopilot/Makefile
+++ b/emulators/xcopilot/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.11 2001/05/06 00:34:44 lebel Exp $
+# $OpenBSD: Makefile,v 1.12 2001/06/03 19:00:16 pvalchev Exp $
 
 COMMENT=	"emulator for US Robotics Pilot PDA"
 
 DISTNAME=       xcopilot-0.6.6
-CATEGORIES=     emulators pilot
+CATEGORIES=     emulators palm
 NEED_VERSION=	1.402
 
 MAINTAINER=     Angelos D. Keromytis <angelos@openbsd.org>
 
-LICENSE_TYPE=		GPL
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/emulators/xcopilot/patches/patch-Makefile_in b/emulators/xcopilot/patches/patch-Makefile_in
new file mode 100644
index 00000000000..b45af98f006
--- /dev/null
+++ b/emulators/xcopilot/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/06/03 19:00:17 pvalchev Exp $
+--- Makefile.in.orig	Tue Aug 25 08:56:23 1998
++++ Makefile.in	Sun Jun  3 12:55:01 2001
+@@ -92,7 +92,7 @@ xcopilot_OBJECTS =  cmap_mgr.o fakecall.
+ xcopilot.o display.o main.o pdebug.o ser-tcp.o open_app.o
+ xcopilot_DEPENDENCIES =  mc68k/libmc68k.a mx/libmx.a
+ xcopilot_LDFLAGS = 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ $(X_CFLAGS)
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+ man1dir = $(mandir)/man1
diff --git a/emulators/xcopilot/patches/patch-aa b/emulators/xcopilot/patches/patch-aa
deleted file mode 100644
index 658996ecfe9..00000000000
--- a/emulators/xcopilot/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** mx/Makefile.in.orig	Mon Aug 31 21:56:13 1998
---- mx/Makefile.in	Mon Aug 31 21:56:32 1998
-***************
-*** 101,107 ****
-  test_filesel_OBJECTS =  test_filesel.o
-  test_filesel_DEPENDENCIES =  libmx.a
-  test_filesel_LDFLAGS = 
-! CFLAGS = @CFLAGS@
-  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-  LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-  DIST_COMMON =  Makefile.am Makefile.in
---- 101,107 ----
-  test_filesel_OBJECTS =  test_filesel.o
-  test_filesel_DEPENDENCIES =  libmx.a
-  test_filesel_LDFLAGS = 
-! CFLAGS = @CFLAGS@ $(X_CFLAGS)
-  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-  LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-  DIST_COMMON =  Makefile.am Makefile.in
diff --git a/emulators/xcopilot/patches/patch-ab b/emulators/xcopilot/patches/patch-ab
deleted file mode 100644
index b4f55ceb755..00000000000
--- a/emulators/xcopilot/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** Makefile.in.orig	Mon Aug 31 22:00:32 1998
---- Makefile.in	Mon Aug 31 22:30:34 1998
-***************
-*** 92,98 ****
-  xcopilot.o display.o main.o pdebug.o ser-tcp.o open_app.o
-  xcopilot_DEPENDENCIES =  mc68k/libmc68k.a mx/libmx.a
-  xcopilot_LDFLAGS = 
-! CFLAGS = @CFLAGS@
-  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-  LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-  man1dir = $(mandir)/man1
---- 92,98 ----
-  xcopilot.o display.o main.o pdebug.o ser-tcp.o open_app.o
-  xcopilot_DEPENDENCIES =  mc68k/libmc68k.a mx/libmx.a
-  xcopilot_LDFLAGS = 
-! CFLAGS = @CFLAGS@ $(X_CFLAGS)
-  COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-  LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-  man1dir = $(mandir)/man1
diff --git a/emulators/xcopilot/patches/patch-mx_Makefile_in b/emulators/xcopilot/patches/patch-mx_Makefile_in
new file mode 100644
index 00000000000..ad0b50901fa
--- /dev/null
+++ b/emulators/xcopilot/patches/patch-mx_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-mx_Makefile_in,v 1.1 2001/06/03 19:00:17 pvalchev Exp $
+--- mx/Makefile.in.orig	Tue Aug 25 08:56:27 1998
++++ mx/Makefile.in	Sun Jun  3 12:55:01 2001
+@@ -101,7 +101,7 @@ test_menu_LDFLAGS = 
+ test_filesel_OBJECTS =  test_filesel.o
+ test_filesel_DEPENDENCIES =  libmx.a
+ test_filesel_LDFLAGS = 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ $(X_CFLAGS)
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  Makefile.am Makefile.in