diff --git a/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_am b/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_am
new file mode 100644
index 00000000000..778a923dc90
--- /dev/null
+++ b/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_am
@@ -0,0 +1,13 @@
+$OpenBSD: patch-WINGs_Extras_Makefile_am,v 1.1 2001/02/07 13:32:34 wilfried Exp $
+--- WINGs/Extras/Makefile.am.orig	Sun Jan  7 00:21:58 2001
++++ WINGs/Extras/Makefile.am	Wed Feb  7 10:00:22 2001
+@@ -4,8 +4,7 @@ AUTOMAKE_OPTIONS = no-dependencies
+ 
+ 
+ 
+-# is this a kluge? if so, how should i do it?
+-includedir = @includedir@/WINGs
++includedir = @includedir@
+ 
+ include_HEADERS = wtableview.h wtabledelegates.h 
+ 
diff --git a/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_in b/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_in
new file mode 100644
index 00000000000..4b2078f2146
--- /dev/null
+++ b/x11/windowmaker/patches/patch-WINGs_Extras_Makefile_in
@@ -0,0 +1,13 @@
+$OpenBSD: patch-WINGs_Extras_Makefile_in,v 1.1 2001/02/07 13:32:35 wilfried Exp $
+--- WINGs/Extras/Makefile.in.orig	Sun Jan  7 00:22:06 2001
++++ WINGs/Extras/Makefile.in	Wed Feb  7 10:00:27 2001
+@@ -94,8 +94,7 @@ wprefsdir = @wprefsdir@
+ 
+ AUTOMAKE_OPTIONS = no-dependencies
+ 
+-# is this a kluge? if so, how should i do it?
+-includedir = @includedir@/WINGs
++includedir = @includedir@
+ 
+ include_HEADERS = wtableview.h wtabledelegates.h 
+ 
diff --git a/x11/windowmaker/patches/patch-WINGs_Makefile_am b/x11/windowmaker/patches/patch-WINGs_Makefile_am
new file mode 100644
index 00000000000..ca70235842c
--- /dev/null
+++ b/x11/windowmaker/patches/patch-WINGs_Makefile_am
@@ -0,0 +1,13 @@
+$OpenBSD: patch-WINGs_Makefile_am,v 1.1 2001/02/07 13:32:36 wilfried Exp $
+--- WINGs/Makefile.am.orig	Sun Jan  7 00:21:58 2001
++++ WINGs/Makefile.am	Wed Feb  7 10:00:11 2001
+@@ -8,8 +8,7 @@ SUBDIRS = . Documentation Resources Exam
+ 
+ #libWINGs_la_LDFLAGS = -version-info 1:1:0
+ 
+-# is this a kluge? if so, how should i do it?
+-includedir = @includedir@/WINGs
++includedir = @includedir@
+ 
+ include_HEADERS = WINGs.h WUtil.h WINGsP.h
+ 
diff --git a/x11/windowmaker/patches/patch-WINGs_Makefile_in b/x11/windowmaker/patches/patch-WINGs_Makefile_in
new file mode 100644
index 00000000000..3f3ba13610b
--- /dev/null
+++ b/x11/windowmaker/patches/patch-WINGs_Makefile_in
@@ -0,0 +1,13 @@
+$OpenBSD: patch-WINGs_Makefile_in,v 1.1 2001/02/07 13:32:36 wilfried Exp $
+--- WINGs/Makefile.in.orig	Sun Jan  7 00:22:02 2001
++++ WINGs/Makefile.in	Wed Feb  7 10:00:19 2001
+@@ -98,8 +98,7 @@ SUBDIRS = . Documentation Resources Exam
+ 
+ #libWINGs_la_LDFLAGS = -version-info 1:1:0
+ 
+-# is this a kluge? if so, how should i do it?
+-includedir = @includedir@/WINGs
++includedir = @includedir@
+ 
+ include_HEADERS = WINGs.h WUtil.h WINGsP.h
+ 
diff --git a/x11/windowmaker/pkg/PLIST b/x11/windowmaker/pkg/PLIST
index ae40ac48000..a3a3e4662b5 100644
--- a/x11/windowmaker/pkg/PLIST
+++ b/x11/windowmaker/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.20 2001/01/19 03:44:51 jasoni Exp $
+@comment $OpenBSD: PLIST,v 1.21 2001/02/07 13:32:36 wilfried Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -84,13 +84,13 @@ bin/wmsetup
 bin/wsetfont
 bin/wxcopy
 bin/wxpaste
-include/WINGs/WINGs.h
-include/WINGs/WINGsP.h
-include/WINGs/WUtil.h
-include/WINGs/wtabledelegates.h
-include/WINGs/wtableview.h
+include/WINGs.h
+include/WINGsP.h
 include/WMaker.h
+include/WUtil.h
 include/wraster.h
+include/wtabledelegates.h
+include/wtableview.h
 lib/libExtraWINGs.a
 lib/libWINGs.a
 lib/libWMaker.a
@@ -361,7 +361,6 @@ share/WindowMaker/xtree.dat
 @dirrm share/WINGs
 @exec mkdir -p %D/lib/locale
 @dirrm lib/locale
-@dirrm include/WINGs
 @exec mkdir -p %D/GNUstep/Apps/WPrefs.app/xpm
 @dirrm GNUstep/Apps/WPrefs.app/xpm
 @dirrm GNUstep/Apps/WPrefs.app/tiff