diff --git a/misc/plan/patches/patch-aa b/misc/plan/patches/patch-Makefile
similarity index 100%
rename from misc/plan/patches/patch-aa
rename to misc/plan/patches/patch-Makefile
diff --git a/misc/plan/patches/patch-ab b/misc/plan/patches/patch-src-Makefile
similarity index 95%
rename from misc/plan/patches/patch-ab
rename to misc/plan/patches/patch-src-Makefile
index b836001c594..afe1879700e 100644
--- a/misc/plan/patches/patch-ab
+++ b/misc/plan/patches/patch-src-Makefile
@@ -1,5 +1,5 @@
---- src/Makefile.orig	Sun Apr 13 21:50:29 1997
-+++ src/Makefile	Thu Jun 19 14:11:42 1997
+--- src/Makefile.orig	Sun Apr 13 13:50:29 1997
++++ src/Makefile	Sat Apr 15 01:02:14 2000
 @@ -6,16 +6,22 @@
  # DO NOT put a blank between the path and the #, or you'll get compile errors.
  #
@@ -56,7 +56,7 @@
  BSDIG_C	= -ansi -I/usr/X11/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX -Dbsdi
  NBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
  	  -DNO_MOTIF
-+OBSD_C	= $(CFLAGS) -ansi -I/usr/X11R6/include -DBSD -DFLOCK -DRABBITS -Dopenbsd -DSTDLIBMALLOC
++OBSD_C	= $(CFLAGS) -ansi -I/usr/local/include -I/usr/X11R6/include -DBSD -DFLOCK -DRABBITS -Dopenbsd -DSTDLIBMALLOC
 +IBM_C	= -O -I/usr/include/X11 -D_ALL_SOURCE -DIBM -DAIXV3 -DNOMSEP -DRABBITS
 +PS2_C	= -O -I/usr/include/X11 -D_POSIX_SOURCE\
  LINUX_C	= -D_POSIX_SOURCE -DNOLOCK -DLINUX
@@ -66,7 +66,7 @@
  BSDIG_L2= -L/usr/X11/lib -lc
  NBSD_L1	= -L/usr/X11R6/lib -lXm -lXt -lX11
  NBSD_L2	= -L/usr/X11R6/lib -lc
-+OBSD_L1	= -L/usr/X11R6/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
++OBSD_L1	= -L /usr/local/lib -L/usr/X11R6/lib ${MOTIFLIB} -lXt -lX11 -lXext -lc
 +OBSD_L2	= -lc
  LINUX_L1= -L/usr/lib/X11R6/lib -lXm -lXt -lX11 -lXpm -lc -lXext
  LINUX_L2= -lc
diff --git a/misc/plan/patches/patch-ac b/misc/plan/patches/patch-src-daemon_c
similarity index 100%
rename from misc/plan/patches/patch-ac
rename to misc/plan/patches/patch-src-daemon_c
diff --git a/misc/plan/patches/patch-aj b/misc/plan/patches/patch-src-daycalc_c
similarity index 100%
rename from misc/plan/patches/patch-aj
rename to misc/plan/patches/patch-src-daycalc_c
diff --git a/misc/plan/patches/patch-ad b/misc/plan/patches/patch-src-help_c
similarity index 100%
rename from misc/plan/patches/patch-ad
rename to misc/plan/patches/patch-src-help_c
diff --git a/misc/plan/patches/patch-ae b/misc/plan/patches/patch-src-holiday_c
similarity index 100%
rename from misc/plan/patches/patch-ae
rename to misc/plan/patches/patch-src-holiday_c
diff --git a/misc/plan/patches/patch-af b/misc/plan/patches/patch-src-netplan_c
similarity index 100%
rename from misc/plan/patches/patch-af
rename to misc/plan/patches/patch-src-netplan_c
diff --git a/misc/plan/patches/patch-ag b/misc/plan/patches/patch-src-sublist_c
similarity index 100%
rename from misc/plan/patches/patch-ag
rename to misc/plan/patches/patch-src-sublist_c
diff --git a/misc/plan/patches/patch-ah b/misc/plan/patches/patch-src-weekcalc_c
similarity index 100%
rename from misc/plan/patches/patch-ah
rename to misc/plan/patches/patch-src-weekcalc_c
diff --git a/misc/plan/patches/patch-ai b/misc/plan/patches/patch-src-yovcalc_c
similarity index 100%
rename from misc/plan/patches/patch-ai
rename to misc/plan/patches/patch-src-yovcalc_c