diff --git a/README.SuSE b/README.SUSE
similarity index 100%
rename from README.SuSE
rename to README.SUSE
diff --git a/WindowMaker-0.95.7.tar.gz b/WindowMaker-0.95.7.tar.gz
deleted file mode 100644
index f1b9e81..0000000
--- a/WindowMaker-0.95.7.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
-size 3238325
diff --git a/WindowMaker-0.95.8.tar.gz b/WindowMaker-0.95.8.tar.gz
new file mode 100644
index 0000000..c8870db
--- /dev/null
+++ b/WindowMaker-0.95.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
+size 3253515
diff --git a/WindowMaker-config.patch b/WindowMaker-config.patch
index ed297fb..86711a4 100644
--- a/WindowMaker-config.patch
+++ b/WindowMaker-config.patch
@@ -9,7 +9,7 @@ Index: WindowMaker/Defaults/WindowMaker.in
    PopupSwitchMenu = NO;
    MenuStyle = normal;
    DisableMiniwindows = NO;
-@@ -33,7 +34,7 @@
+@@ -34,7 +35,7 @@
    IconSize = 64;
    FocusMode = manual;
    DisableWSMouseActions = NO;
@@ -274,7 +274,7 @@ Index: util/wmaker.inst.in
 ===================================================================
 --- util/wmaker.inst.in.orig
 +++ util/wmaker.inst.in
-@@ -276,41 +276,41 @@ echo "    $GSDIR/Library/WindowMaker/$in
+@@ -280,41 +280,41 @@ echo "    $GSDIR/Library/WindowMaker/$in
  }
  
  wmaker_found=0
diff --git a/WindowMaker-menu.patch b/WindowMaker-menu.patch
index 0519177..bc83cce 100644
--- a/WindowMaker-menu.patch
+++ b/WindowMaker-menu.patch
@@ -1,146 +1,7 @@
-Index: WindowMaker-0.95.6/WindowMaker/menu
+Index: WindowMaker/menu.bg.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu
-+++ WindowMaker-0.95.6/WindowMaker/menu
-@@ -111,72 +111,18 @@
- 	"Info" MENU
- 		"Info Panel" INFO_PANEL
- 		"Legal" LEGAL_PANEL
--		"System Console" EXEC xconsole
--		"System Load" SHEXEC xosview || xload
--		"Process List" EXEC xterm -e top
--		"Manual Browser" EXEC xman
- 	"Info" END
- 	"Run..." SHEXEC %a(Run,Type command to run:)
- 	"XTerm" EXEC xterm -sb 
--	"Mozilla Firefox" EXEC firefox
- 	"Workspaces" WORKSPACE_MENU
--	"Applications" MENU
--		"Gimp" SHEXEC gimp >/dev/null
--  		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
--		"Xpdf" EXEC xpdf %a(Xpdf,Enter PDF to view)
--		"Abiword" EXEC abiword
--		"Dia" EXEC dia
--		"OpenOffice.org" MENU
--			"OpenOffice.org" EXEC ooffice
--			"Writer" EXEC oowriter
--			"Spreadsheet" EXEC oocalc
--			"Draw" EXEC oodraw
--			"Impress" EXEC ooimpress
--		"OpenOffice.org" END 
--
--		"Editors" MENU
--			"XEmacs" EXEC xemacs
--			"Emacs" EXEC emacs
--			"XJed" EXEC xjed 
--			"VI" EXEC xterm -e vi
--			"GVIM" EXEC gvim
--			"NEdit" EXEC nedit
--			"Xedit" EXEC xedit
--		"Editors" END
--
--		"Multimedia" MENU
--			"XMMS" MENU
--				"XMMS" EXEC xmms
--				"XMMS play/pause" EXEC xmms -t
--				"XMMS stop" EXEC xmms -s
--			"XMMS" END
--			"Xine video player" EXEC xine
--			"MPlayer" EXEC mplayer
--		"Multimedia" END
--	"Applications" END
--
--	"Utils" MENU
--		"Calculator" EXEC xcalc
--		"Window Properties" SHEXEC xprop | xmessage -center -title 'xprop' -file -
--		"Font Chooser" EXEC xfontsel
--		"Magnify" EXEC wmagnify
--		"Colormap" EXEC xcmap
--		"Kill X Application" EXEC xkill
--	"Utils" END
--
--	"Selection" MENU
--		"Copy" SHEXEC echo '%s' | wxcopy
--		"Mail To" EXEC xterm -name mail -T "Pine" -e pine %s
--		"Navigate" EXEC netscape %s
--		"Search in Manual" SHEXEC MANUAL_SEARCH(%s)
--	"Selection" END
--
- 	"Commands" MENU
- 		"Hide Others" HIDE_OTHERS
- 		"Show All" SHOW_ALL
- 		"Arrange Icons" ARRANGE_ICONS
- 		"Refresh" REFRESH
- 		"Lock" EXEC xlock -allowroot -usefirst
-+		"Save Session" SAVE_SESSION
-+		"Clear Session" CLEAR_SESSION
- 	"Commands" END
- 
- 	"Appearance" MENU
-@@ -185,40 +131,37 @@
- 		"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
- 		"Background" MENU
- 			"Solid" MENU
--				"Black" WS_BACK '(solid, black)'
--				"Blue"  WS_BACK '(solid, "#505075")'
-+                        	"Black" WS_BACK '(solid, black)'
-+                        	"Blue"  WS_BACK '(solid, "#505075")'
- 				"Indigo" WS_BACK '(solid, "#243e6c")'
--				"Bluemarine" WS_BACK '(solid, "#224477")'
--				"Purple" WS_BACK '(solid, "#554466")'
--				"Wheat"  WS_BACK '(solid, "wheat4")'
--				"Dark Gray"  WS_BACK '(solid, "#333340")'
--				"Wine" WS_BACK '(solid, "#400020")'
--				"Solid" END
-+				"Bleumarine" WS_BACK '(solid, "#224477")'
-+                        	"Purple" WS_BACK '(solid, "#554466")'
-+                        	"Wheat"  WS_BACK '(solid, "wheat4")'
-+                        	"Dark Gray"  WS_BACK '(solid, "#333340")'
-+                        	"Wine" WS_BACK '(solid, "#400020")'
-+			"Solid" END
- 			"Gradient" MENU
- 				"Sunset" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
- 				"Sky" WS_BACK '(vgradient, blue4, white)'
--    			"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
-+    				"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
- 				"Indigo Shades" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
--			    "Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
--    			"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
--    			"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
--    			"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
-+			    	"Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
-+    				"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
-+    				"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
-+    				"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
- 			"Gradient" END
- 			"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
- 		"Background" END
- 		"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
- 		"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
--		"Preferences Utility" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Preferences Utility" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Appearance" END
--
--	"Session" MENU
--		"Save Session" SAVE_SESSION
--		"Clear Session" CLEAR_SESSION
--		"Restart Window Maker" RESTART
--		"Start BlackBox" RESTART blackbox
--		"Start IceWM" RESTART icewm
-+	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
-+	"SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
-+	"Exit"	MENU
-+		"Restart" RESTART
- 		"Exit"  EXIT
--	"Session" END
-+	"Exit" END
- "Applications" END
- 
- 
-Index: WindowMaker-0.95.6/WindowMaker/menu.bg
-===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.bg
-+++ WindowMaker-0.95.6/WindowMaker/menu.bg
+--- WindowMaker/menu.bg.in.orig
++++ WindowMaker/menu.bg.in
 @@ -115,60 +115,10 @@
  	"Инфо" MENU
  		"Информационен панел..." INFO_PANEL
@@ -202,12 +63,9 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.bg
  
  	"Работно място" MENU
  		"Скрий другите" HIDE_OTHERS
-@@ -209,14 +159,12 @@
- 		"Фон" END
- 		"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
+@@ -211,12 +161,10 @@
  		"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
--		"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Пособие за настройки" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+ 		"Пособие за настройки" EXEC #wprefs#
  	"Изглед" END
 -
 +        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
@@ -220,10 +78,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.bg
  		"Изход..."  EXIT
  	"Изход" END
  "Приложения" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.ca
+Index: WindowMaker/menu.ca
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.ca
-+++ WindowMaker-0.95.6/WindowMaker/menu.ca
+--- WindowMaker/menu.ca.orig
++++ WindowMaker/menu.ca
 @@ -110,60 +110,9 @@
          "Informació" MENU
                  "Info Panel..." INFO_PANEL
@@ -302,10 +160,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ca
          "Sortir" END
  "Aplicacions" END
  
-Index: WindowMaker-0.95.6/WindowMaker/menu.cs
+Index: WindowMaker/menu.cs
 ===================================================================
 --- /dev/null
-+++ WindowMaker-0.95.6/WindowMaker/menu.cs
++++ WindowMaker/menu.cs
 @@ -0,0 +1,85 @@
 +// Text bellow is in czech, encoding ISO8829-2.
 +//
@@ -392,10 +250,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.cs
 +		"Ukončit..."  EXIT
 +	 "Konec" END
 +"Hlavní menu" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.da
+Index: WindowMaker/menu.da
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.da
-+++ WindowMaker-0.95.6/WindowMaker/menu.da
+--- WindowMaker/menu.da.orig
++++ WindowMaker/menu.da
 @@ -103,62 +103,10 @@
          "Info" MENU
                  "Info Panel..." INFO_PANEL
@@ -474,10 +332,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.da
                  "Afslut..."  EXIT
          "Afslut" END
  "Applikationer" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.de
+Index: WindowMaker/menu.de
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.de
-+++ WindowMaker-0.95.6/WindowMaker/menu.de
+--- WindowMaker/menu.de.orig
++++ WindowMaker/menu.de
 @@ -44,55 +44,9 @@
  	"Info" MENU
  		"Info Panel..." INFO_PANEL
@@ -556,10 +414,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.de
 -		"Sitzung beenden..." SHUTDOWN
  	"Beenden" END
  "Anwendungen" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.el
+Index: WindowMaker/menu.el
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.el
-+++ WindowMaker-0.95.6/WindowMaker/menu.el
+--- WindowMaker/menu.el.orig
++++ WindowMaker/menu.el
 @@ -118,62 +118,10 @@
  	"Πληροφορίες" MENU
  		"Σχετικά..." INFO_PANEL
@@ -640,10 +498,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.el
  		 "Έξοδος..."  EXIT
  	"Έξοδος" END
  "Μενού" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.es
+Index: WindowMaker/menu.es
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.es
-+++ WindowMaker-0.95.6/WindowMaker/menu.es
+--- WindowMaker/menu.es.orig
++++ WindowMaker/menu.es
 @@ -43,62 +43,9 @@
  	"Informacion ..." MENU
  		"Copyright..." SHEXEC xmessage -center -font variable -title \
@@ -734,10 +592,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.es
 -		"Salir de la sesion" SHUTDOWN
  	"Salir ..." END
  "Menu Principal" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.fi
+Index: WindowMaker/menu.fi.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.fi
-+++ WindowMaker-0.95.6/WindowMaker/menu.fi
+--- WindowMaker/menu.fi.in.orig
++++ WindowMaker/menu.fi.in
 @@ -108,61 +108,10 @@
  	"Tietoja" MENU
  		"Tietoja..." INFO_PANEL
@@ -800,12 +658,9 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.fi
  	"Työtila" MENU
  		"Piilota muut" HIDE_OTHERS
  		"Näytä kaikki ikkunat" SHOW_ALL
-@@ -202,14 +151,12 @@
- 		"Taustat" END
- 		"Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)"
+@@ -204,12 +153,10 @@
  		"Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)"
--		"Asetukset" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Asetukset" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+ 		"Asetukset" EXEC #wprefs#
  	"Ulkonäkö" END
 -
 +        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
@@ -818,10 +673,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.fi
  		"Lopeta"  EXIT
  	"Lopeta" END
  "Sovellukset" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.fr
+Index: WindowMaker/menu.fr
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.fr
-+++ WindowMaker-0.95.6/WindowMaker/menu.fr
+--- WindowMaker/menu.fr.orig
++++ WindowMaker/menu.fr
 @@ -154,61 +154,10 @@
  	"Informations" MENU
  		"Panneau d'informations" INFO_PANEL
@@ -900,10 +755,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.fr
 -		"Tuer la session..." SHUTDOWN
  	"Quitter" END
  "Applications" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.gl
+Index: WindowMaker/menu.gl
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.gl
-+++ WindowMaker-0.95.6/WindowMaker/menu.gl
+--- WindowMaker/menu.gl.orig
++++ WindowMaker/menu.gl
 @@ -45,56 +45,9 @@
  	"Información" MENU
  		"Info Panel..." INFO_PANEL
@@ -980,10 +835,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.gl
 -		"Sair da sesión..." SHUTDOWN
  	"Sair" END
  "Aplicacións" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.he
+Index: WindowMaker/menu.he
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.he
-+++ WindowMaker-0.95.6/WindowMaker/menu.he
+--- WindowMaker/menu.he.orig
++++ WindowMaker/menu.he
 @@ -97,60 +97,9 @@
  	"עדימ" MENU
  		"Info Panel..." INFO_PANEL
@@ -1062,10 +917,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.he
  	"האיצי" END
  "םימושי" END
  
-Index: WindowMaker-0.95.6/WindowMaker/menu.hr
+Index: WindowMaker/menu.hr
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.hr
-+++ WindowMaker-0.95.6/WindowMaker/menu.hr
+--- WindowMaker/menu.hr.orig
++++ WindowMaker/menu.hr
 @@ -97,62 +97,9 @@
  	"Informacije" MENU
                  "Info Panel..." INFO_PANEL
@@ -1146,10 +1001,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.hr
 -		"Izlaz iz sessiona..." SHUTDOWN
  	"Izlaz" END
  "Programi" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.hu
+Index: WindowMaker/menu.hu.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.hu
-+++ WindowMaker-0.95.6/WindowMaker/menu.hu
+--- WindowMaker/menu.hu.in.orig
++++ WindowMaker/menu.hu.in
 @@ -111,62 +111,10 @@
  	"Infó" MENU
  		"Információs panel..." INFO_PANEL
@@ -1213,16 +1068,13 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.hu
  	"Munkafelület" MENU
  		"Elrejtés" HIDE_OTHERS
  		"Mindent mutat" SHOW_ALL
-@@ -204,14 +152,13 @@
- 		"Háttér" END
- 		"Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)"
+@@ -206,12 +154,10 @@
  		"Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)"
--		"Konfiguráló program" EXEC /usr/bin/WPrefs
-+		"Konfiguráló program" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+ 		"Konfiguráló program" EXEC #wprefs#
  	"Megjelenés" END
- 
-+	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
-+	"SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
+-
++        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
++        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
  	"Kilépés"	MENU
  		"Újraindítás" RESTART
 -		"BlackBox indítása" RESTART blackbox
@@ -1231,10 +1083,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.hu
  		"Kilépés..."  EXIT
  	"Kilépés" END
  "Alkalmazások" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.it
+Index: WindowMaker/menu.it
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.it
-+++ WindowMaker-0.95.6/WindowMaker/menu.it
+--- WindowMaker/menu.it.orig
++++ WindowMaker/menu.it
 @@ -45,58 +45,9 @@
  	"Informazioni" MENU
  		"Info Panel..." INFO_PANEL
@@ -1311,10 +1163,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.it
 -		"Uscire dalla sessione..." SHUTDOWN
  	"Uscire" END
  "Applicazioni" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.ja
+Index: WindowMaker/menu.ja
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.ja
-+++ WindowMaker-0.95.6/WindowMaker/menu.ja
+--- WindowMaker/menu.ja.orig
++++ WindowMaker/menu.ja
 @@ -103,61 +103,8 @@
  	"情報" MENU
  		"Info パネル..." INFO_PANEL
@@ -1394,10 +1246,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ja
  	"終了" END
  "アプリケーション" END
  
-Index: WindowMaker-0.95.6/WindowMaker/menu.ko
+Index: WindowMaker/menu.ko.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.ko
-+++ WindowMaker-0.95.6/WindowMaker/menu.ko
+--- WindowMaker/menu.ko.in.orig
++++ WindowMaker/menu.ko.in
 @@ -102,57 +102,7 @@
  	"정    보" MENU
  		"정보 패널" INFO_PANEL
@@ -1456,15 +1308,6 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ko
  	"작업공간" WORKSPACE_MENU
  	"창 관 리" MENU
  		"다른창 숨김" HIDE_OTHERS
-@@ -163,7 +113,7 @@
- 		"세션 지움" CLEAR_SESSION
- 	"창 관 리" END
- 	"작업환경" MENU
--		"설    정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
-+		"설    정" SHEXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
- 		"테    마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
- 		"테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)"
- 		"아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
 @@ -188,7 +138,6 @@
  				"타일형식" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
  				"가 운 데" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -e
@@ -1497,10 +1340,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ko
 -		"세션종료" SHUTDOWN
  	"종    료" END
  "윈도우메이커" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.no
+Index: WindowMaker/menu.no
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.no
-+++ WindowMaker-0.95.6/WindowMaker/menu.no
+--- WindowMaker/menu.no.orig
++++ WindowMaker/menu.no
 @@ -100,58 +100,9 @@
  	"Info" MENU
  		"Lisens..." INFO_PANEL
@@ -1576,10 +1419,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.no
 -		"Avslutt X11..." SHUTDOWN
  	"Avslutt" END
  "Applikasjoner" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.pl
+Index: WindowMaker/menu.pl
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.pl
-+++ WindowMaker-0.95.6/WindowMaker/menu.pl
+--- WindowMaker/menu.pl.orig
++++ WindowMaker/menu.pl
 @@ -104,125 +104,12 @@
  	"Informacja" MENU
  		"Informacja o WMaker..." INFO_PANEL
@@ -1725,10 +1568,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.pl
 -		"Zabicie sesji..." SHUTDOWN
  	"Wyjście" END
  "WindowMaker" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.pt
+Index: WindowMaker/menu.pt
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.pt
-+++ WindowMaker-0.95.6/WindowMaker/menu.pt
+--- WindowMaker/menu.pt.orig
++++ WindowMaker/menu.pt
 @@ -106,61 +106,9 @@
  	"Informações" MENU
  		"Informações..." INFO_PANEL
@@ -1808,10 +1651,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.pt
  	"Sair" END
  "Aplicações" END
  
-Index: WindowMaker-0.95.6/WindowMaker/menu.ro
+Index: WindowMaker/menu.ro.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.ro
-+++ WindowMaker-0.95.6/WindowMaker/menu.ro
+--- WindowMaker/menu.ro.in.orig
++++ WindowMaker/menu.ro.in
 @@ -108,61 +108,10 @@
  	"Informaţii" MENU
  		"Panou cu Informaţii" INFO_PANEL
@@ -1874,15 +1717,9 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ro
  	"Spaţiu de Lucru" MENU
  		"Ascunde Celelalte" HIDE_OTHERS
  		"Arată Tot" SHOW_ALL
-@@ -200,16 +149,14 @@
- 			"Gradientat" END
- 			"Imagini" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
- 		"Fundal" END
--		"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
-+ 		"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
+@@ -204,12 +153,10 @@
  		"Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
--		"Utilitar de Configurare" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Utilitar de Configurare" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+ 		"Utilitar de Configurare" EXEC #wprefs#
  	"Configurare" END
 -
 +        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
@@ -1895,10 +1732,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ro
  		"Ieşi"  EXIT
  	"Ieşire" END
  "Aplicaţii" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.ru
+Index: WindowMaker/menu.ru
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.ru
-+++ WindowMaker-0.95.6/WindowMaker/menu.ru
+--- WindowMaker/menu.ru.orig
++++ WindowMaker/menu.ru
 @@ -57,70 +57,19 @@
  	"Информация" MENU
  		"Info Panel..." INFO_PANEL
@@ -1987,10 +1824,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.ru
 -		"Завершить сессию..." SHUTDOWN
  	"Выход" END
  "Приложения" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.sk
+Index: WindowMaker/menu.sk.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.sk
-+++ WindowMaker-0.95.6/WindowMaker/menu.sk
+--- WindowMaker/menu.sk.in.orig
++++ WindowMaker/menu.sk.in
 @@ -122,61 +122,10 @@
  	"Informácie" MENU
  		"Panel Info" INFO_PANEL
@@ -2053,16 +1890,13 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.sk
  	"Pracovná plocha" MENU
  		"Skryť ostatné" HIDE_OTHERS
  		"Zobraziť všetky" SHOW_ALL
-@@ -216,14 +165,13 @@
- 		"Pozadie" END
- 		"Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)"
+@@ -218,12 +167,10 @@
  		"Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)"
--		"Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Konfiguračný nástroj" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+ 		"Konfiguračný nástroj" EXEC #wprefs#
  	"Vzhľad" END
+-
 +        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
 +        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
- 
  	"Koniec" MENU
  		"Reštartovať" RESTART
 -		"Spustiť BlackBox" RESTART blackbox
@@ -2071,10 +1905,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.sk
  		"Koniec"  EXIT
  	"Koniec" END
  "Aplikácie" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.sl
+Index: WindowMaker/menu.sl
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.sl
-+++ WindowMaker-0.95.6/WindowMaker/menu.sl
+--- WindowMaker/menu.sl.orig
++++ WindowMaker/menu.sl
 @@ -105,61 +105,9 @@
  	"Informacije" MENU
  		"Informacije o programu..." INFO_PANEL
@@ -2153,10 +1987,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.sl
 -		"Izhod iz session..." SHUTDOWN
  	"Izhod" END
  "Aplikacije" END
-Index: WindowMaker-0.95.6/WindowMaker/menu.tr
+Index: WindowMaker/menu.tr
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.tr
-+++ WindowMaker-0.95.6/WindowMaker/menu.tr
+--- WindowMaker/menu.tr.orig
++++ WindowMaker/menu.tr
 @@ -91,61 +91,9 @@
  	"Bilgi" MENU
  		"Copyright..." EXEC xmessage -center -font variable -title \
@@ -2237,166 +2071,10 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.tr
  	"Çıkış" END
  "Ana Menü" END
  
-Index: WindowMaker-0.95.6/WindowMaker/menu.zh_TW
+Index: WindowMaker/plmenu.bg.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.zh_TW
-+++ WindowMaker-0.95.6/WindowMaker/menu.zh_TW
-@@ -199,7 +199,7 @@
- 		"背景" END
- 		"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
- 		"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
--		"偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"偏好設定公用程式" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
- 	"外觀" END
- 
- 	"離開"	MENU
-Index: WindowMaker-0.95.6/WindowMaker/plmenu
-===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu
-+++ WindowMaker-0.95.6/WindowMaker/plmenu
-@@ -1,106 +1,55 @@
- ("Applications",
-  ("Info",
-   ("Info Panel", INFO_PANEL),
--  ("Legal", LEGAL_PANEL),
--  ("System Console", EXEC, "xconsole"),
--  ("System Load", SHEXEC, "xosview || xload"),
--  ("Process List", EXEC, "xterm -e top"),
--  ("Manual Browser", EXEC, "xman")
-- ),
-+  ("Legal", LEGAL_PANEL)
-+  ),
-  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
-  ("XTerm", EXEC, "xterm -sb"),
-- ("Mozilla Firefox", EXEC, "firefox"),
-  ("Workspaces", WORKSPACE_MENU),
-- ("Applications",
--  ("Gimp", SHEXEC, "gimp >/dev/null"),
--  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
--  ("Abiword", EXEC, "abiword"),
--  ("Dia", EXEC, "dia"),
--  ("OpenOffice.org",
--   ("OpenOffice.org", EXEC, "ooffice"),
--   ("Writer", EXEC, "oowriter"),
--   ("Spreadsheet", EXEC, "oocalc"),
--   ("Draw", EXEC, "oodraw"),
--   ("Impress", EXEC, "ooimpress")
--  ),
--  ("Editors",
--   ("XEmacs", EXEC, "xemacs"),
--   ("Emacs", EXEC, "emacs"),
--   ("XJed", EXEC, "xjed"),
--   ("VI", EXEC, "xterm -e vi"),
--   ("GVIM", EXEC, "gvim"),
--   ("NEdit", EXEC, "nedit"),
--   ("Xedit", EXEC, "xedit")
--  ),
--  ("Multimedia",
--   ("XMMS",
--    ("XMMS", EXEC, "xmms"),
--    ("XMMS play/pause", EXEC, "xmms -t"),
--    ("XMMS stop", EXEC, "xmms -s")
--   ),
--   ("Xine video player", EXEC, "xine"),
--   ("MPlayer", EXEC, "mplayer")
--  )
-- ),
-- ("Utils",
--  ("Calculator", EXEC, "xcalc"),
--  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--  ("Font Chooser", EXEC, "xfontsel"),
--  ("Magnify", EXEC, "wmagnify"),
--  ("Colormap", EXEC, "xcmap"),
--  ("Kill X Application", EXEC, "xkill")
-- ),
-- ("Selection",
--  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
--  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
--  ("Navigate", EXEC, "mozilla %s"),
--  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
-- ),
-  ("Commands",
-   ("Hide Others", HIDE_OTHERS),
-   ("Show All", SHOW_ALL),
-   ("Arrange Icons", ARRANGE_ICONS),
-   ("Refresh", REFRESH),
--  ("Lock", EXEC, "xlock -allowroot -usefirst")
-- ),
-+  ("Lock", EXEC, "xlock -allowroot -usefirst"),
-+  ("Save Session", SAVE_SESSION),
-+  ("Clear Session", CLEAR_SESSION)
-+  ),
-  ("Appearance",
-   ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-   ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-   ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-   ("Background",
-    ("Solid",
--	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
--	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
--	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
--	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
--	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
--	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
--	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
--	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-+    ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-+    ("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-+    ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-+    ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-+    ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-+    ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-+    ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-+    ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-    ),
-    ("Gradient",
--	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
--	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
--	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
--	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
--	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
--	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
--	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
--	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-+    ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-+    ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-+    ("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-+    ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-+    ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-+    ("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-+    ("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-+    ("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-    ),
-    ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-    ),
--   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
--   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
--   ),
--   ("Session",
--    ("Save Session", SAVE_SESSION),
--    ("Clear Session", CLEAR_SESSION),
--	("Restart Window Maker", RESTART),
--	("Start BlackBox", RESTART, blackbox),
--	("Start IceWM", RESTART, icewm),
--	("Exit", EXIT)
--   )
-+  ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-+  ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-+  ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ),
-+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
-+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
-+ ("Exit",
-+  ("Restart", RESTART),
-+  ("Exit", EXIT)
-+ )
- )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.bg
-===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.bg
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.bg
+--- WindowMaker/plmenu.bg.in.orig
++++ WindowMaker/plmenu.bg.in
 @@ -1,61 +1,10 @@
  ("Приложения",
   ("Инфо",
@@ -2460,12 +2138,9 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.bg
   ("Работно място",
    ("Скрий другите", HIDE_OTHERS),
    ("Покажи всички", SHOW_ALL),
-@@ -94,13 +43,12 @@
-    ),
-   ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+@@ -96,11 +45,10 @@
    ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Пособие за настройки", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Пособие за настройки", EXEC, "#wprefs#")
    ),
 + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
 + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
@@ -2477,10 +2152,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.bg
    ("Изход...", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.cs
+Index: WindowMaker/plmenu.cs
 ===================================================================
 --- /dev/null
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.cs
++++ WindowMaker/plmenu.cs
 @@ -0,0 +1,158 @@
 +(
 +"Hlavní menu",
@@ -2640,10 +2315,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.cs
 +		("Ukončit...", EXIT)
 +	 )
 +)
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.da
+Index: WindowMaker/plmenu.da
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.da
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.da
+--- WindowMaker/plmenu.da.orig
++++ WindowMaker/plmenu.da
 @@ -3,23 +3,7 @@
          (
          "Info",
@@ -2887,10 +2562,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.da
                  ("Afslut...", EXIT)
          )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.de
+Index: WindowMaker/plmenu.de
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.de
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.de
+--- WindowMaker/plmenu.de.orig
++++ WindowMaker/plmenu.de
 @@ -1,61 +1,11 @@
  ("Anwendungen",
   ("Info",
@@ -2989,10 +2664,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.de
    ("Beenden...", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.es
+Index: WindowMaker/plmenu.es.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.es
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.es
+--- WindowMaker/plmenu.es.in.orig
++++ WindowMaker/plmenu.es.in
 @@ -1,61 +1,10 @@
  ("Aplicaciones",
   ("Informacion",
@@ -3078,8 +2753,7 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.es
     ),   
    ("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
    ("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Preferencias", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Preferencias", EXEC, "#wprefs#")
    ), 
 + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
 + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
@@ -3091,10 +2765,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.es
    ("Salir", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.fi
+Index: WindowMaker/plmenu.fi.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.fi
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.fi
+--- WindowMaker/plmenu.fi.in.orig
++++ WindowMaker/plmenu.fi.in
 @@ -3,27 +3,7 @@
  	(
  	"Tietoja",
@@ -3346,16 +3020,12 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.fi
  			)
  		),
  		(
-@@ -357,15 +154,14 @@
- 		(
- 		"Asetukset",
- 		EXEC,
--		"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
-+		"/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
+@@ -360,12 +157,11 @@
+ 		"#wprefs#"
  		)
  	),
-+        ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
-+	("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
++    ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
++    ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  	(
  	"Lopeta",
  		("Käynnistä WM uudelleen", RESTART),
@@ -3365,10 +3035,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.fi
  		("Lopeta", EXIT)
  	)
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.fr
+Index: WindowMaker/plmenu.fr
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.fr
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.fr
+--- WindowMaker/plmenu.fr.orig
++++ WindowMaker/plmenu.fr
 @@ -1,61 +1,11 @@
  ("Applications",
    ("Informations",
@@ -3467,10 +3137,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.fr
 +   ("Quitter...", EXIT)
    )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.hr
+Index: WindowMaker/plmenu.hr
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.hr
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.hr
+--- WindowMaker/plmenu.hr.orig
++++ WindowMaker/plmenu.hr
 @@ -3,77 +3,12 @@
    (
      Info,
@@ -3611,10 +3281,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.hr
 +    (Izlaz..., EXIT)
    )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.it
+Index: WindowMaker/plmenu.it
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.it
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.it
+--- WindowMaker/plmenu.it.orig
++++ WindowMaker/plmenu.it
 @@ -1,61 +1,11 @@
  ("Applicazioni",
   ("Informazioni",
@@ -3715,10 +3385,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.it
 -  ("Uccidi sessione...", SHUTDOWN)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.ja
+Index: WindowMaker/plmenu.ja.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.ja
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.ja
+--- WindowMaker/plmenu.ja.in.orig
++++ WindowMaker/plmenu.ja.in
 @@ -1,44 +1,10 @@
  ("アプリケーション",
   ("情報",
@@ -3778,14 +3448,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ja
   ("ワークスペース",
    ("他をハイド", HIDE_OTHERS),
    ("全て表示", SHOW_ALL),
-@@ -94,13 +54,12 @@
-    ),   
-   ("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+@@ -96,11 +56,10 @@
    ("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
--  ), 
-+  ("設定ユーティリティ", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ),
+   ("設定ユーティリティ", EXEC, "#wprefs#")
+   ), 
 + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
 + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
   ("終了",
@@ -3796,10 +3462,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ja
    ("終了", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.ko
+Index: WindowMaker/plmenu.ko.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.ko
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.ko
+--- WindowMaker/plmenu.ko.in.orig
++++ WindowMaker/plmenu.ko.in
 @@ -1,57 +1,7 @@
  ("윈도우메이커",
   ("정    보",
@@ -3859,13 +3525,11 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ko
    ),
   ("창 관 리",
    ("다른창숨김", HIDE_OTHERS),
-@@ -63,11 +13,11 @@
-   ),
+@@ -64,10 +14,10 @@
   ("작업공간", WORKSPACE_MENU),
   ("작업환경",
--  ("설    정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
+   ("설    정", SHEXEC, "#wprefs# || wmakerconf"),
 -  ("테    마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-+  ("설    정", SHEXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
 +  ("테    마", OPEN_MENU, "-noext #wmdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
    ("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""),
 -  ("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
@@ -3875,6 +3539,19 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ko
    ("아이콘셋저장", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(아이콘셋 이름,파일 이름을 입력하세요:)\""),
    ("배경화면",
     ("단    색",
+@@ -82,9 +32,9 @@
+     ("색지정", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"%a(배경색:)\")'")
+     ),
+    ("그    림",
+-    ("전체화면", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -s"),
+-    ("타일형식", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
+-    ("가 운 데", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -e")
++    ("전체화면", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -s"),
++    ("타일형식", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
++    ("가 운 데", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -e")
+     ),
+    ("그래디언트",
+     ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
 @@ -98,18 +48,10 @@
      )
     )
@@ -3897,10 +3574,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ko
 +  ("종    료", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.pl
+Index: WindowMaker/plmenu.pl
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.pl
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.pl
+--- WindowMaker/plmenu.pl.orig
++++ WindowMaker/plmenu.pl
 @@ -1,125 +1,12 @@
  ("WindowMaker",
  	("Informacja",
@@ -4050,10 +3727,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.pl
 +		("Wyjście...",       EXIT)
  	)
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.ro
+Index: WindowMaker/plmenu.ro.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.ro
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.ro
+--- WindowMaker/plmenu.ro.in.orig
++++ WindowMaker/plmenu.ro.in
 @@ -1,61 +1,11 @@
  ("Aplicaţii",
   ("Informaţii",
@@ -4117,12 +3794,9 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ro
   ("Spaţiu de Lucru",
    ("Ascunde Celelalte", HIDE_OTHERS),
    ("Arată celelalte", SHOW_ALL),
-@@ -94,13 +44,12 @@
-    ),   
-   ("Salvează Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+@@ -96,11 +46,10 @@
    ("Salvează Setul de Iconiţe", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Utilitar de Configurare", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Utilitar de Configurare", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Utilitar de Configurare", EXEC, "#wprefs#")
    ), 
 + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
 + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
@@ -4134,10 +3808,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.ro
    ("Ieşi", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.sk
+Index: WindowMaker/plmenu.sk.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.sk
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.sk
+--- WindowMaker/plmenu.sk.in.orig
++++ WindowMaker/plmenu.sk.in
 @@ -1,61 +1,11 @@
  ("Aplikácie",
   ("Info",
@@ -4201,12 +3875,9 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.sk
   ("Pracovná plocha",
    ("Skryť ostatné", HIDE_OTHERS),
    ("Zobraziť všetky", SHOW_ALL),
-@@ -94,13 +44,12 @@
-    ),   
-   ("Uložiť tému", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+@@ -96,11 +46,10 @@
    ("Uložiť sadu ikon", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Konfiguračný nástroj", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Konfiguračný nástroj", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Konfiguračný nástroj", EXEC, "#wprefs#")
    ), 
 + ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
 + ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
@@ -4218,10 +3889,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.sk
    ("Koniec", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_CN
+Index: WindowMaker/plmenu.zh_CN
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.zh_CN
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.zh_CN
+--- WindowMaker/plmenu.zh_CN.orig
++++ WindowMaker/plmenu.zh_CN
 @@ -1,63 +1,11 @@
  ("应用程序",
   ("信息",
@@ -4306,10 +3977,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_CN
    ("退出...", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_TW
+Index: WindowMaker/plmenu.zh_TW.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/plmenu.zh_TW
-+++ WindowMaker-0.95.6/WindowMaker/plmenu.zh_TW
+--- WindowMaker/plmenu.zh_TW.in.orig
++++ WindowMaker/plmenu.zh_TW.in
 @@ -1,59 +1,11 @@
  ("應用程式",
   ("資訊",
@@ -4372,15 +4043,12 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_TW
   ("工作區",
    ("隱藏其他", HIDE_OTHERS),
    ("全部顯示", SHOW_ALL),
-@@ -92,13 +44,12 @@
-    ),
-   ("儲存主題", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"),
+@@ -94,11 +46,10 @@
    ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"),
--  ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("偏好設定公用程式", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("偏好設定公用程式", EXEC, "#wprefs#")
    ),
-+  ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
-+  ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
   ("離開",
    ("重新啟動", RESTART),
 -  ("啟動 BlackBox", RESTART, blackbox),
@@ -4389,10 +4057,10 @@ Index: WindowMaker-0.95.6/WindowMaker/plmenu.zh_TW
    ("離開...", EXIT)
   )
  )
-Index: WindowMaker-0.95.6/WindowMaker/menu.nl
+Index: WindowMaker/menu.nl.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/menu.nl
-+++ WindowMaker-0.95.6/WindowMaker/menu.nl
+--- WindowMaker/menu.nl.in.orig
++++ WindowMaker/menu.nl.in
 @@ -111,65 +111,9 @@
  	"Info" MENU
  		"Infopaneel" INFO_PANEL
@@ -4461,7 +4129,7 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.nl
  		"Andere verbergen" HIDE_OTHERS
 @@ -210,13 +154,12 @@
  		"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
- 		"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+ 		"Voorkeurenhulpmiddel" EXEC #wprefs#
  	"Uiterlijk" END
 -
 +	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
@@ -4475,3 +4143,81 @@ Index: WindowMaker-0.95.6/WindowMaker/menu.nl
  		"Afsluiten"  EXIT
  	"Sessie" END
  "Programma's" END
+Index: WindowMaker/menu.zh_TW.in
+===================================================================
+--- WindowMaker/menu.zh_TW.in.orig
++++ WindowMaker/menu.zh_TW.in
+@@ -107,58 +107,10 @@
+ 		"資訊面板..." INFO_PANEL
+ 		"法律..." LEGAL_PANEL
+ 		"系統主控台" EXEC xconsole
+-		"系統負載" SHEXEC xosview || xload
+-		"行程清單" EXEC xterm -e top
+-		"手冊瀏覽器" EXEC xman
+ 	"資訊" END
+ 	"執行..." EXEC %a (執行，輸入執行的命令：)
+ 	"終端機" EXEC crxvt -thin -ls -T 終端機 -n 終端機
+ 	"工作區" WORKSPACE_MENU
+-	"應用程式" MENU
+-		"影像處理" MENU
+-			"Gimp" SHEXEC gimp >/dev/null
+-			"XV" EXEC xv
+-			"XPaint" EXEC xpaint
+-			"XFig" EXEC xfig
+-		"影像處理" END
+-		"X 檔案管理員" EXEC xfm
+-		"OffiX Files" EXEC files
+-		"LyX" EXEC lyx
+-		"Netscape" EXEC netscape 
+-  		"Ghostview" EXEC ghostview %a(GhostView,輸入要檢視的檔案)
+-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(輸入要檢視的 PDF)
+-  		"TkDesk" EXEC tkdesk
+-	"應用程式" END
+-	"編輯器" MENU
+-		"XFte" EXEC xfte
+-		"XEmacs" SHEXEC xemacs || emacs
+-		"XJed" EXEC xjed 
+-		"NEdit" EXEC nedit
+-		"Xedit" EXEC xedit
+-		"VI" EXEC xterm -e vi
+-	"編輯器" END
+-	"雜項" MENU
+-		"Xmcd" SHEXEC xmcd 2> /dev/null
+-		"Xplaycd" EXEC xplaycd
+-		"Xmixer" EXEC xmixer
+-	"雜項" END
+-	"公用程式" MENU
+-		"計算機" EXEC xcalc
+-		"Window Properties" SHEXEC xprop | xmessage -center -title 'xprop' -file -
+-		"Font Chooser" EXEC xfontsel
+-		"終端機模擬器" EXEC xminicom
+-		"Magnify" EXEC xmag
+-		"Colormap" EXEC xcmap
+-		"XKill" EXEC xkill
+-		"Clipboard" EXEC xclipboard
+-	"公用程式" END
+-
+-	"選取" MENU
+-		"複製" SHEXEC echo '%s' | wxcopy
+-		"郵寄至" EXEC xterm -name mail -T "Pine" -e pine %s
+-		"Navigate" EXEC netscape %s
+-		"在手冊中搜尋" SHEXEC MANUAL_SEARCH(%s)
+-	"選取" END
+ 
+ 	"工作區" MENU
+ 		"隱藏其他" HIDE_OTHERS
+@@ -201,12 +153,10 @@
+ 		"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
+ 		"偏好設定公用程式" EXEC #wprefs#
+ 	"外觀" END
+-
++        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
++        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
+ 	"離開"	MENU
+ 		"重新啟動" RESTART
+-		"啟動 BlackBox" RESTART blackbox
+-		"啟動 kwm" RESTART kwm
+-		"啟動 IceWM" RESTART icewm
+ 		"離開..."  EXIT
+ 	"離開" END
+ "應用程式" END
diff --git a/WindowMaker.changes b/WindowMaker.changes
index 1db2065..3de9497 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Mar 14 22:02:11 UTC 2017 - chris@computersalat.de
+
+- Update to 0.95.8
+  * for changes and news see
+    http://repo.or.cz/wmaker-crm.git/blob/HEAD:/NEWS
+    http://repo.or.cz/wmaker-crm.git/blob/HEAD:/ChangeLog
+- rework/rebase patches
+  * WindowMaker-menu.patch
+  * wm-giflib.patch
+- some spec cleanup
+  * rename README.SuSE -> README.SUSE
+
+-------------------------------------------------------------------
+Sat Jun 25 18:13:37 UTC 2016 - chris@computersalat.de
+
+- rebase patches (p0)
+  * WindowMaker-config.patch
+  * WindowMaker-menu.patch
+  * fix_wmgenmenu_paths.patch
+  * wm-giflib.patch
+
 -------------------------------------------------------------------
 Tue Mar 22 13:03:08 UTC 2016 - kmroz@suse.com
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index e6da396..5c7fae4 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package WindowMaker
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@ Name:           WindowMaker
 Summary:        A Colorful and Flexible Window Manager
 License:        GPL-2.0+ and LGPL-2.1+ and SUSE-Public-Domain
 Group:          System/GUI/Other
-Version:        0.95.7
+Version:        0.95.8
 Release:        0
 # 81eefca4ef70414d73048300058e5007f402dd7f
 # f846b7cdd39749b5291d4559185a229b752b4fed
@@ -29,7 +29,7 @@ Url:            http://windowmaker.org/
 Source:         http://windowmaker.org/pub/source/release/%{name}-%{version}.tar.gz
 Source1:        %{name}-extra-0.1.tar.bz2
 Source2:        theme.tar.bz2
-Source4:        README.SuSE
+Source4:        README.SUSE
 Source5:        %{name}.desktop
 Source6:        windowmaker
 Source7:        %{name}-rpmlintrc
@@ -39,6 +39,7 @@ Patch3:         fix_wmgenmenu_paths.patch
 #
 Patch101:       wm-giflib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fdupes
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gcc-c++
@@ -96,25 +97,19 @@ developing applications which use WindowMaker.
 mkdir menu_orig
 cp %{name}/{menu.*,plmenu.*} menu_orig
 %patch1
-%patch2 -p1
-%patch3 -p1
-%patch101 -p1
+%patch2
+%patch3
+%patch101
 cp %{S:4} .
 cp %{S:6} .
 %if 0%{?suse_version} < 1140
 rename no nb po/no.*
 %endif
-(cd %{name}; rm -f *.orig; ./mkMakefile )
 # ---------------------------------------------------------------------------
 
 %build
 ./autogen.sh
-#autoreconf --force --install
-%if 0%{?suse_version} >= 1140
 export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW"
-%else
-export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl nb pl pt ro ru sk sv tr zh_CN zh_TW"
-%endif
 export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
 %configure \
   --prefix=/usr \
@@ -127,7 +122,6 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
   --with-pixmapdir=/usr/share/%{name}/Pixmaps \
   --with-gnustepdir=/usr/lib/GNUstep
 
-(cd %{name}/Defaults; make clean; make %{?_smp_mflags})
 make %{?_smp_mflags}
 (cd %{name}-extra-0.1
 %configure \
@@ -167,6 +161,9 @@ cd ..
 %find_lang WPrefs %{name}.lang
 %find_lang wmgenmenu %{name}.lang
 
+# rpmlint
+%fdupes -s $RPM_BUILD_ROOT/usr/share/
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
diff --git a/fix_wmgenmenu_paths.patch b/fix_wmgenmenu_paths.patch
index 3191768..38ad003 100644
--- a/fix_wmgenmenu_paths.patch
+++ b/fix_wmgenmenu_paths.patch
@@ -12,10 +12,10 @@ Fix this by writing strings composed with PKGDATADIR.
 
 Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
 ---
-Index: WindowMaker-0.95.6/util/wmgenmenu.c
+Index: util/wmgenmenu.c
 ===================================================================
---- WindowMaker-0.95.6.orig/util/wmgenmenu.c
-+++ WindowMaker-0.95.6/util/wmgenmenu.c
+--- util/wmgenmenu.c.orig
++++ util/wmgenmenu.c
 @@ -41,12 +41,13 @@ int main(int argc, char *argv[])
  {
  	char *t;
@@ -31,7 +31,7 @@ Index: WindowMaker-0.95.6/util/wmgenmenu.c
  
  	struct option longopts[] = {
  		{ "version",		no_argument,	NULL,	'v' },
-@@ -244,7 +245,7 @@ int main(int argc, char *argv[])
+@@ -245,7 +246,7 @@ int main(int argc, char *argv[])
  	L3Menu = WMCreatePLArray(
  		WMCreatePLString(_("Images")),
  		WMCreatePLString("OPEN_MENU"),
@@ -40,7 +40,7 @@ Index: WindowMaker-0.95.6/util/wmgenmenu.c
  		NULL
  	);
  	WMAddToPLArray(L2Menu, L3Menu);
-@@ -333,7 +334,7 @@ int main(int argc, char *argv[])
+@@ -334,7 +335,7 @@ int main(int argc, char *argv[])
  	L1Menu = WMCreatePLArray(
  		WMCreatePLString(_("Configure Window Maker")),
  		WMCreatePLString("EXEC"),
diff --git a/wm-giflib.patch b/wm-giflib.patch
index e535a36..d0be662 100644
--- a/wm-giflib.patch
+++ b/wm-giflib.patch
@@ -167,10 +167,10 @@
  wrlib/tests/view.c              |    4 ++++
  167 files changed, 668 insertions(+), 3 deletions(-)
 
-Index: WindowMaker-0.95.7/WINGs/Examples/colorpick.c
+Index: WINGs/Examples/colorpick.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Examples/colorpick.c
-+++ WindowMaker-0.95.7/WINGs/Examples/colorpick.c
+--- WINGs/Examples/colorpick.c.orig
++++ WINGs/Examples/colorpick.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -180,10 +180,10 @@ Index: WindowMaker-0.95.7/WINGs/Examples/colorpick.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WindowMaker-0.95.7/WINGs/Examples/fontl.c
+Index: WINGs/Examples/fontl.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Examples/fontl.c
-+++ WindowMaker-0.95.7/WINGs/Examples/fontl.c
+--- WINGs/Examples/fontl.c.orig
++++ WINGs/Examples/fontl.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -195,10 +195,10 @@ Index: WindowMaker-0.95.7/WINGs/Examples/fontl.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <stdint.h>
-Index: WindowMaker-0.95.7/WINGs/Examples/puzzle.c
+Index: WINGs/Examples/puzzle.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Examples/puzzle.c
-+++ WindowMaker-0.95.7/WINGs/Examples/puzzle.c
+--- WINGs/Examples/puzzle.c.orig
++++ WINGs/Examples/puzzle.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -208,10 +208,10 @@ Index: WindowMaker-0.95.7/WINGs/Examples/puzzle.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <WINGs/WINGs.h>
-Index: WindowMaker-0.95.7/WINGs/Extras/test.c
+Index: WINGs/Extras/test.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Extras/test.c
-+++ WindowMaker-0.95.7/WINGs/Extras/test.c
+--- WINGs/Extras/test.c.orig
++++ WINGs/Extras/test.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -221,10 +221,10 @@ Index: WindowMaker-0.95.7/WINGs/Extras/test.c
  #include <WINGs/WINGs.h>
  #include <stdio.h>
  #include <stdint.h>
-Index: WindowMaker-0.95.7/WINGs/Extras/wtabledelegates.c
+Index: WINGs/Extras/wtabledelegates.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Extras/wtabledelegates.c
-+++ WindowMaker-0.95.7/WINGs/Extras/wtabledelegates.c
+--- WINGs/Extras/wtabledelegates.c.orig
++++ WINGs/Extras/wtabledelegates.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -234,10 +234,10 @@ Index: WindowMaker-0.95.7/WINGs/Extras/wtabledelegates.c
  #include <stdint.h>
  #include <WINGs/WINGsP.h>
  
-Index: WindowMaker-0.95.7/WINGs/Extras/wtableview.c
+Index: WINGs/Extras/wtableview.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Extras/wtableview.c
-+++ WindowMaker-0.95.7/WINGs/Extras/wtableview.c
+--- WINGs/Extras/wtableview.c.orig
++++ WINGs/Extras/wtableview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -247,10 +247,10 @@ Index: WindowMaker-0.95.7/WINGs/Extras/wtableview.c
  #include <WINGs/WINGsP.h>
  #include <X11/cursorfont.h>
  #include <stdint.h>
-Index: WindowMaker-0.95.7/WINGs/Tests/mywidget.c
+Index: WINGs/Tests/mywidget.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Tests/mywidget.c
-+++ WindowMaker-0.95.7/WINGs/Tests/mywidget.c
+--- WINGs/Tests/mywidget.c.orig
++++ WINGs/Tests/mywidget.c
 @@ -13,6 +13,10 @@
   *
   *
@@ -262,10 +262,10 @@ Index: WindowMaker-0.95.7/WINGs/Tests/mywidget.c
  #include <WINGs/WINGsP.h>
  
  /*
-Index: WindowMaker-0.95.7/WINGs/Tests/testmywidget.c
+Index: WINGs/Tests/testmywidget.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Tests/testmywidget.c
-+++ WindowMaker-0.95.7/WINGs/Tests/testmywidget.c
+--- WINGs/Tests/testmywidget.c.orig
++++ WINGs/Tests/testmywidget.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -275,10 +275,10 @@ Index: WindowMaker-0.95.7/WINGs/Tests/testmywidget.c
  #include <WINGs/WINGs.h>
  #include <stdlib.h>
  
-Index: WindowMaker-0.95.7/WINGs/Tests/wmfile.c
+Index: WINGs/Tests/wmfile.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Tests/wmfile.c
-+++ WindowMaker-0.95.7/WINGs/Tests/wmfile.c
+--- WINGs/Tests/wmfile.c.orig
++++ WINGs/Tests/wmfile.c
 @@ -11,6 +11,10 @@
   -----------------------------------------------------------------------
   */
@@ -290,10 +290,10 @@ Index: WindowMaker-0.95.7/WINGs/Tests/wmfile.c
  #include <WINGs/WINGs.h>
  
  #include <unistd.h>
-Index: WindowMaker-0.95.7/WINGs/Tests/wmquery.c
+Index: WINGs/Tests/wmquery.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Tests/wmquery.c
-+++ WindowMaker-0.95.7/WINGs/Tests/wmquery.c
+--- WINGs/Tests/wmquery.c.orig
++++ WINGs/Tests/wmquery.c
 @@ -3,6 +3,10 @@
   * Author: Len Trigg <trigg@cs.waikato.ac.nz>
   */
@@ -305,10 +305,10 @@ Index: WindowMaker-0.95.7/WINGs/Tests/wmquery.c
  #include <WINGs/WINGs.h>
  
  #include <unistd.h>
-Index: WindowMaker-0.95.7/WINGs/Tests/wtest.c
+Index: WINGs/Tests/wtest.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/Tests/wtest.c
-+++ WindowMaker-0.95.7/WINGs/Tests/wtest.c
+--- WINGs/Tests/wtest.c.orig
++++ WINGs/Tests/wtest.c
 @@ -2,6 +2,10 @@
   * WINGs test application
   */
@@ -320,10 +320,10 @@ Index: WindowMaker-0.95.7/WINGs/Tests/wtest.c
  #include <WINGs/WINGs.h>
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/WINGs/array.c
+Index: WINGs/array.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/array.c
-+++ WindowMaker-0.95.7/WINGs/array.c
+--- WINGs/array.c.orig
++++ WINGs/array.c
 @@ -8,6 +8,10 @@
   * proper credit is always appreciated :)
   */
@@ -335,10 +335,10 @@ Index: WindowMaker-0.95.7/WINGs/array.c
  #include <stdlib.h>
  #include <string.h>
  
-Index: WindowMaker-0.95.7/WINGs/bagtree.c
+Index: WINGs/bagtree.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/bagtree.c
-+++ WindowMaker-0.95.7/WINGs/bagtree.c
+--- WINGs/bagtree.c.orig
++++ WINGs/bagtree.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -348,10 +348,10 @@ Index: WindowMaker-0.95.7/WINGs/bagtree.c
  #include <stdlib.h>
  #include <string.h>
  
-Index: WindowMaker-0.95.7/WINGs/configuration.c
+Index: WINGs/configuration.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/configuration.c
-+++ WindowMaker-0.95.7/WINGs/configuration.c
+--- WINGs/configuration.c.orig
++++ WINGs/configuration.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -361,10 +361,10 @@ Index: WindowMaker-0.95.7/WINGs/configuration.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.7/WINGs/data.c
+Index: WINGs/data.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/data.c
-+++ WindowMaker-0.95.7/WINGs/data.c
+--- WINGs/data.c.orig
++++ WINGs/data.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -376,10 +376,10 @@ Index: WindowMaker-0.95.7/WINGs/data.c
  #include <string.h>
  #include "WUtil.h"
  
-Index: WindowMaker-0.95.7/WINGs/dragcommon.c
+Index: WINGs/dragcommon.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/dragcommon.c
-+++ WindowMaker-0.95.7/WINGs/dragcommon.c
+--- WINGs/dragcommon.c.orig
++++ WINGs/dragcommon.c
 @@ -1,5 +1,9 @@
  #include "wconfig.h"
  
@@ -390,10 +390,10 @@ Index: WindowMaker-0.95.7/WINGs/dragcommon.c
  #include "WINGsP.h"
  
  #define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
-Index: WindowMaker-0.95.7/WINGs/dragdestination.c
+Index: WINGs/dragdestination.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/dragdestination.c
-+++ WindowMaker-0.95.7/WINGs/dragdestination.c
+--- WINGs/dragdestination.c.orig
++++ WINGs/dragdestination.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -403,10 +403,10 @@ Index: WindowMaker-0.95.7/WINGs/dragdestination.c
  #include "WINGsP.h"
  #include <X11/Xatom.h>
  
-Index: WindowMaker-0.95.7/WINGs/dragsource.c
+Index: WINGs/dragsource.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/dragsource.c
-+++ WindowMaker-0.95.7/WINGs/dragsource.c
+--- WINGs/dragsource.c.orig
++++ WINGs/dragsource.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -416,10 +416,10 @@ Index: WindowMaker-0.95.7/WINGs/dragsource.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WindowMaker-0.95.7/WINGs/error.c
+Index: WINGs/error.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/error.c
-+++ WindowMaker-0.95.7/WINGs/error.c
+--- WINGs/error.c.orig
++++ WINGs/error.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -431,10 +431,10 @@ Index: WindowMaker-0.95.7/WINGs/error.c
  #include "wconfig.h"
  
  #include <stdarg.h>
-Index: WindowMaker-0.95.7/WINGs/findfile.c
+Index: WINGs/findfile.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/findfile.c
-+++ WindowMaker-0.95.7/WINGs/findfile.c
+--- WINGs/findfile.c.orig
++++ WINGs/findfile.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -446,10 +446,10 @@ Index: WindowMaker-0.95.7/WINGs/findfile.c
  #include "wconfig.h"
  
  #include "WUtil.h"
-Index: WindowMaker-0.95.7/WINGs/handlers.c
+Index: WINGs/handlers.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/handlers.c
-+++ WindowMaker-0.95.7/WINGs/handlers.c
+--- WINGs/handlers.c.orig
++++ WINGs/handlers.c
 @@ -3,6 +3,10 @@
   * WINGs internal handlers: timer, idle and input handlers
   */
@@ -461,10 +461,10 @@ Index: WindowMaker-0.95.7/WINGs/handlers.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WindowMaker-0.95.7/WINGs/hashtable.c
+Index: WINGs/hashtable.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/hashtable.c
-+++ WindowMaker-0.95.7/WINGs/hashtable.c
+--- WINGs/hashtable.c.orig
++++ WINGs/hashtable.c
 @@ -1,5 +1,9 @@
  #include <config.h>
  
@@ -475,10 +475,10 @@ Index: WindowMaker-0.95.7/WINGs/hashtable.c
  #include <sys/types.h>
  #include <string.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/WINGs/memory.c
+Index: WINGs/memory.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/memory.c
-+++ WindowMaker-0.95.7/WINGs/memory.c
+--- WINGs/memory.c.orig
++++ WINGs/memory.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -490,10 +490,10 @@ Index: WindowMaker-0.95.7/WINGs/memory.c
  #include "wconfig.h"
  #include "WUtil.h"
  
-Index: WindowMaker-0.95.7/WINGs/misc.c
+Index: WINGs/misc.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/misc.c
-+++ WindowMaker-0.95.7/WINGs/misc.c
+--- WINGs/misc.c.orig
++++ WINGs/misc.c
 @@ -20,6 +20,10 @@
  
  /* Miscelaneous helper functions */
@@ -505,10 +505,10 @@ Index: WindowMaker-0.95.7/WINGs/misc.c
  #include <WUtil.h>
  
  #include "error.h"
-Index: WindowMaker-0.95.7/WINGs/notification.c
+Index: WINGs/notification.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/notification.c
-+++ WindowMaker-0.95.7/WINGs/notification.c
+--- WINGs/notification.c.orig
++++ WINGs/notification.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -518,10 +518,10 @@ Index: WindowMaker-0.95.7/WINGs/notification.c
  #include <stdlib.h>
  #include <assert.h>
  #include <stdio.h>
-Index: WindowMaker-0.95.7/WINGs/proplist.c
+Index: WINGs/proplist.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/proplist.c
-+++ WindowMaker-0.95.7/WINGs/proplist.c
+--- WINGs/proplist.c.orig
++++ WINGs/proplist.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -531,10 +531,10 @@ Index: WindowMaker-0.95.7/WINGs/proplist.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/WINGs/selection.c
+Index: WINGs/selection.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/selection.c
-+++ WindowMaker-0.95.7/WINGs/selection.c
+--- WINGs/selection.c.orig
++++ WINGs/selection.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -544,10 +544,10 @@ Index: WindowMaker-0.95.7/WINGs/selection.c
  #include <stdlib.h>
  
  #include <X11/Xatom.h>
-Index: WindowMaker-0.95.7/WINGs/string.c
+Index: WINGs/string.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/string.c
-+++ WindowMaker-0.95.7/WINGs/string.c
+--- WINGs/string.c.orig
++++ WINGs/string.c
 @@ -6,6 +6,10 @@
  #   undef _XOPEN_SOURCE
  #endif
@@ -559,10 +559,10 @@ Index: WindowMaker-0.95.7/WINGs/string.c
  #include "wconfig.h"
  
  #include <string.h>
-Index: WindowMaker-0.95.7/WINGs/tree.c
+Index: WINGs/tree.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/tree.c
-+++ WindowMaker-0.95.7/WINGs/tree.c
+--- WINGs/tree.c.orig
++++ WINGs/tree.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -572,10 +572,10 @@ Index: WindowMaker-0.95.7/WINGs/tree.c
  #include <string.h>
  
  #include "WUtil.h"
-Index: WindowMaker-0.95.7/WINGs/userdefaults.c
+Index: WINGs/userdefaults.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/userdefaults.c
-+++ WindowMaker-0.95.7/WINGs/userdefaults.c
+--- WINGs/userdefaults.c.orig
++++ WINGs/userdefaults.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -585,10 +585,10 @@ Index: WindowMaker-0.95.7/WINGs/userdefaults.c
  #include <stdlib.h>
  #include <string.h>
  #include <strings.h>
-Index: WindowMaker-0.95.7/WINGs/usleep.c
+Index: WINGs/usleep.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/usleep.c
-+++ WindowMaker-0.95.7/WINGs/usleep.c
+--- WINGs/usleep.c.orig
++++ WINGs/usleep.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -598,10 +598,10 @@ Index: WindowMaker-0.95.7/WINGs/usleep.c
  #include <errno.h>
  #include <time.h>
  
-Index: WindowMaker-0.95.7/WINGs/wapplication.c
+Index: WINGs/wapplication.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wapplication.c
-+++ WindowMaker-0.95.7/WINGs/wapplication.c
+--- WINGs/wapplication.c.orig
++++ WINGs/wapplication.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -611,10 +611,10 @@ Index: WindowMaker-0.95.7/WINGs/wapplication.c
  #include <unistd.h>
  #include <X11/Xlocale.h>
  
-Index: WindowMaker-0.95.7/WINGs/wappresource.c
+Index: WINGs/wappresource.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wappresource.c
-+++ WindowMaker-0.95.7/WINGs/wappresource.c
+--- WINGs/wappresource.c.orig
++++ WINGs/wappresource.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -624,10 +624,10 @@ Index: WindowMaker-0.95.7/WINGs/wappresource.c
  #include <unistd.h>
  
  #include "WINGsP.h"
-Index: WindowMaker-0.95.7/WINGs/wballoon.c
+Index: WINGs/wballoon.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wballoon.c
-+++ WindowMaker-0.95.7/WINGs/wballoon.c
+--- WINGs/wballoon.c.orig
++++ WINGs/wballoon.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -637,10 +637,10 @@ Index: WindowMaker-0.95.7/WINGs/wballoon.c
  #include "wconfig.h"
  #include "WINGsP.h"
  
-Index: WindowMaker-0.95.7/WINGs/wbox.c
+Index: WINGs/wbox.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wbox.c
-+++ WindowMaker-0.95.7/WINGs/wbox.c
+--- WINGs/wbox.c.orig
++++ WINGs/wbox.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -650,10 +650,10 @@ Index: WindowMaker-0.95.7/WINGs/wbox.c
  #include "WINGsP.h"
  
  typedef struct {
-Index: WindowMaker-0.95.7/WINGs/wbrowser.c
+Index: WINGs/wbrowser.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wbrowser.c
-+++ WindowMaker-0.95.7/WINGs/wbrowser.c
+--- WINGs/wbrowser.c.orig
++++ WINGs/wbrowser.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -663,10 +663,10 @@ Index: WindowMaker-0.95.7/WINGs/wbrowser.c
  #include "WINGsP.h"
  #include <math.h>		/* for : double rint (double) */
  
-Index: WindowMaker-0.95.7/WINGs/wbutton.c
+Index: WINGs/wbutton.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wbutton.c
-+++ WindowMaker-0.95.7/WINGs/wbutton.c
+--- WINGs/wbutton.c.orig
++++ WINGs/wbutton.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -676,10 +676,10 @@ Index: WindowMaker-0.95.7/WINGs/wbutton.c
  #include "WINGsP.h"
  
  typedef struct W_Button {
-Index: WindowMaker-0.95.7/WINGs/wcolor.c
+Index: WINGs/wcolor.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wcolor.c
-+++ WindowMaker-0.95.7/WINGs/wcolor.c
+--- WINGs/wcolor.c.orig
++++ WINGs/wcolor.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -689,10 +689,10 @@ Index: WindowMaker-0.95.7/WINGs/wcolor.c
  #include "WINGsP.h"
  
  #include "wconfig.h"
-Index: WindowMaker-0.95.7/WINGs/wcolorpanel.c
+Index: WINGs/wcolorpanel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wcolorpanel.c
-+++ WindowMaker-0.95.7/WINGs/wcolorpanel.c
+--- WINGs/wcolorpanel.c.orig
++++ WINGs/wcolorpanel.c
 @@ -23,6 +23,10 @@
   * 	-	Resizing
   */
@@ -704,10 +704,10 @@ Index: WindowMaker-0.95.7/WINGs/wcolorpanel.c
  #include "wconfig.h"
  #include "WINGsP.h"
  #include "rgb.h"
-Index: WindowMaker-0.95.7/WINGs/wcolorwell.c
+Index: WINGs/wcolorwell.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wcolorwell.c
-+++ WindowMaker-0.95.7/WINGs/wcolorwell.c
+--- WINGs/wcolorwell.c.orig
++++ WINGs/wcolorwell.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -717,10 +717,10 @@ Index: WindowMaker-0.95.7/WINGs/wcolorwell.c
  #include "WINGsP.h"
  
  #define XDND_COLOR_DATA_TYPE "application/X-color"
-Index: WindowMaker-0.95.7/WINGs/wevent.c
+Index: WINGs/wevent.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wevent.c
-+++ WindowMaker-0.95.7/WINGs/wevent.c
+--- WINGs/wevent.c.orig
++++ WINGs/wevent.c
 @@ -3,6 +3,10 @@
   * This event handling stuff was inspired on Tk.
   */
@@ -732,10 +732,10 @@ Index: WindowMaker-0.95.7/WINGs/wevent.c
  #include "WINGsP.h"
  
  /* table to map event types to event masks */
-Index: WindowMaker-0.95.7/WINGs/wfilepanel.c
+Index: WINGs/wfilepanel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wfilepanel.c
-+++ WindowMaker-0.95.7/WINGs/wfilepanel.c
+--- WINGs/wfilepanel.c.orig
++++ WINGs/wfilepanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -745,10 +745,10 @@ Index: WindowMaker-0.95.7/WINGs/wfilepanel.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/WINGs/wfont.c
+Index: WINGs/wfont.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wfont.c
-+++ WindowMaker-0.95.7/WINGs/wfont.c
+--- WINGs/wfont.c.orig
++++ WINGs/wfont.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -758,10 +758,10 @@ Index: WindowMaker-0.95.7/WINGs/wfont.c
  #include <stdlib.h>
  
  #include "wconfig.h"
-Index: WindowMaker-0.95.7/WINGs/wfontpanel.c
+Index: WINGs/wfontpanel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wfontpanel.c
-+++ WindowMaker-0.95.7/WINGs/wfontpanel.c
+--- WINGs/wfontpanel.c.orig
++++ WINGs/wfontpanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -771,10 +771,10 @@ Index: WindowMaker-0.95.7/WINGs/wfontpanel.c
  #include "WINGsP.h"
  #include "WUtil.h"
  #include "wconfig.h"
-Index: WindowMaker-0.95.7/WINGs/wframe.c
+Index: WINGs/wframe.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wframe.c
-+++ WindowMaker-0.95.7/WINGs/wframe.c
+--- WINGs/wframe.c.orig
++++ WINGs/wframe.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -784,10 +784,10 @@ Index: WindowMaker-0.95.7/WINGs/wframe.c
  #include "WINGsP.h"
  
  typedef struct W_Frame {
-Index: WindowMaker-0.95.7/WINGs/widgets.c
+Index: WINGs/widgets.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/widgets.c
-+++ WindowMaker-0.95.7/WINGs/widgets.c
+--- WINGs/widgets.c.orig
++++ WINGs/widgets.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -797,10 +797,10 @@ Index: WindowMaker-0.95.7/WINGs/widgets.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.7/WINGs/winputmethod.c
+Index: WINGs/winputmethod.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/winputmethod.c
-+++ WindowMaker-0.95.7/WINGs/winputmethod.c
+--- WINGs/winputmethod.c.orig
++++ WINGs/winputmethod.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -810,10 +810,10 @@ Index: WindowMaker-0.95.7/WINGs/winputmethod.c
  #include <X11/Xlib.h>
  
  #include "wconfig.h"
-Index: WindowMaker-0.95.7/WINGs/wlabel.c
+Index: WINGs/wlabel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wlabel.c
-+++ WindowMaker-0.95.7/WINGs/wlabel.c
+--- WINGs/wlabel.c.orig
++++ WINGs/wlabel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -823,10 +823,10 @@ Index: WindowMaker-0.95.7/WINGs/wlabel.c
  #include "WINGsP.h"
  
  typedef struct W_Label {
-Index: WindowMaker-0.95.7/WINGs/wlist.c
+Index: WINGs/wlist.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wlist.c
-+++ WindowMaker-0.95.7/WINGs/wlist.c
+--- WINGs/wlist.c.orig
++++ WINGs/wlist.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -836,10 +836,10 @@ Index: WindowMaker-0.95.7/WINGs/wlist.c
  #include "WINGsP.h"
  
  char *WMListDidScrollNotification = "WMListDidScrollNotification";
-Index: WindowMaker-0.95.7/WINGs/wmenuitem.c
+Index: WINGs/wmenuitem.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wmenuitem.c
-+++ WindowMaker-0.95.7/WINGs/wmenuitem.c
+--- WINGs/wmenuitem.c.orig
++++ WINGs/wmenuitem.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -849,10 +849,10 @@ Index: WindowMaker-0.95.7/WINGs/wmenuitem.c
  #include "WINGsP.h"
  
  typedef struct W_MenuItem {
-Index: WindowMaker-0.95.7/WINGs/wmisc.c
+Index: WINGs/wmisc.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wmisc.c
-+++ WindowMaker-0.95.7/WINGs/wmisc.c
+--- WINGs/wmisc.c.orig
++++ WINGs/wmisc.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -862,10 +862,10 @@ Index: WindowMaker-0.95.7/WINGs/wmisc.c
  #include "WINGsP.h"
  
  #include <wraster.h>
-Index: WindowMaker-0.95.7/WINGs/wpanel.c
+Index: WINGs/wpanel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wpanel.c
-+++ WindowMaker-0.95.7/WINGs/wpanel.c
+--- WINGs/wpanel.c.orig
++++ WINGs/wpanel.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -875,10 +875,10 @@ Index: WindowMaker-0.95.7/WINGs/wpanel.c
  #include "WINGsP.h"
  
  #include <X11/keysym.h>
-Index: WindowMaker-0.95.7/WINGs/wpixmap.c
+Index: WINGs/wpixmap.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wpixmap.c
-+++ WindowMaker-0.95.7/WINGs/wpixmap.c
+--- WINGs/wpixmap.c.orig
++++ WINGs/wpixmap.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -888,10 +888,10 @@ Index: WindowMaker-0.95.7/WINGs/wpixmap.c
  #include "WINGsP.h"
  
  #include <wraster.h>
-Index: WindowMaker-0.95.7/WINGs/wpopupbutton.c
+Index: WINGs/wpopupbutton.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wpopupbutton.c
-+++ WindowMaker-0.95.7/WINGs/wpopupbutton.c
+--- WINGs/wpopupbutton.c.orig
++++ WINGs/wpopupbutton.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -901,10 +901,10 @@ Index: WindowMaker-0.95.7/WINGs/wpopupbutton.c
  #include "WINGsP.h"
  
  typedef struct W_PopUpButton {
-Index: WindowMaker-0.95.7/WINGs/wprogressindicator.c
+Index: WINGs/wprogressindicator.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wprogressindicator.c
-+++ WindowMaker-0.95.7/WINGs/wprogressindicator.c
+--- WINGs/wprogressindicator.c.orig
++++ WINGs/wprogressindicator.c
 @@ -5,6 +5,10 @@
   * - centralized drawing into one pain function
   */
@@ -916,10 +916,10 @@ Index: WindowMaker-0.95.7/WINGs/wprogressindicator.c
  #include "WINGsP.h"
  
  typedef struct W_ProgressIndicator {
-Index: WindowMaker-0.95.7/WINGs/wruler.c
+Index: WINGs/wruler.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wruler.c
-+++ WindowMaker-0.95.7/WINGs/wruler.c
+--- WINGs/wruler.c.orig
++++ WINGs/wruler.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -931,10 +931,10 @@ Index: WindowMaker-0.95.7/WINGs/wruler.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.7/WINGs/wscroller.c
+Index: WINGs/wscroller.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wscroller.c
-+++ WindowMaker-0.95.7/WINGs/wscroller.c
+--- WINGs/wscroller.c.orig
++++ WINGs/wscroller.c
 @@ -7,6 +7,10 @@
  #   undef _XOPEN_SOURCE
  #endif
@@ -946,10 +946,10 @@ Index: WindowMaker-0.95.7/WINGs/wscroller.c
  #include "WINGsP.h"
  
  #include <math.h>
-Index: WindowMaker-0.95.7/WINGs/wscrollview.c
+Index: WINGs/wscrollview.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wscrollview.c
-+++ WindowMaker-0.95.7/WINGs/wscrollview.c
+--- WINGs/wscrollview.c.orig
++++ WINGs/wscrollview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -959,10 +959,10 @@ Index: WindowMaker-0.95.7/WINGs/wscrollview.c
  #include "WINGsP.h"
  
  typedef struct W_ScrollView {
-Index: WindowMaker-0.95.7/WINGs/wslider.c
+Index: WINGs/wslider.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wslider.c
-+++ WindowMaker-0.95.7/WINGs/wslider.c
+--- WINGs/wslider.c.orig
++++ WINGs/wslider.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -972,10 +972,10 @@ Index: WindowMaker-0.95.7/WINGs/wslider.c
  #include "WINGsP.h"
  
  #undef STRICT_NEXT_BEHAVIOUR
-Index: WindowMaker-0.95.7/WINGs/wsplitview.c
+Index: WINGs/wsplitview.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wsplitview.c
-+++ WindowMaker-0.95.7/WINGs/wsplitview.c
+--- WINGs/wsplitview.c.orig
++++ WINGs/wsplitview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -985,10 +985,10 @@ Index: WindowMaker-0.95.7/WINGs/wsplitview.c
  #include "WINGsP.h"
  
  /*
-Index: WindowMaker-0.95.7/WINGs/wtabview.c
+Index: WINGs/wtabview.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wtabview.c
-+++ WindowMaker-0.95.7/WINGs/wtabview.c
+--- WINGs/wtabview.c.orig
++++ WINGs/wtabview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -998,10 +998,10 @@ Index: WindowMaker-0.95.7/WINGs/wtabview.c
  #include "WINGsP.h"
  
  typedef struct W_TabView {
-Index: WindowMaker-0.95.7/WINGs/wtext.c
+Index: WINGs/wtext.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wtext.c
-+++ WindowMaker-0.95.7/WINGs/wtext.c
+--- WINGs/wtext.c.orig
++++ WINGs/wtext.c
 @@ -1,6 +1,10 @@
  
  /*  WINGs WMText: multi-line/font/color/graphic text widget,  by Nwanua. */
@@ -1013,10 +1013,10 @@ Index: WindowMaker-0.95.7/WINGs/wtext.c
  #include "WINGsP.h"
  #include <ctype.h>
  #include <X11/keysym.h>
-Index: WindowMaker-0.95.7/WINGs/wtextfield.c
+Index: WINGs/wtextfield.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wtextfield.c
-+++ WindowMaker-0.95.7/WINGs/wtextfield.c
+--- WINGs/wtextfield.c.orig
++++ WINGs/wtextfield.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1026,10 +1026,10 @@ Index: WindowMaker-0.95.7/WINGs/wtextfield.c
  #include "WINGsP.h"
  #include "wconfig.h"
  
-Index: WindowMaker-0.95.7/WINGs/wutil.c
+Index: WINGs/wutil.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wutil.c
-+++ WindowMaker-0.95.7/WINGs/wutil.c
+--- WINGs/wutil.c.orig
++++ WINGs/wutil.c
 @@ -3,6 +3,10 @@
   * Handle events for non-GUI based applications
   */
@@ -1041,10 +1041,10 @@ Index: WindowMaker-0.95.7/WINGs/wutil.c
  #include "WINGsP.h"
  
  void WHandleEvents()
-Index: WindowMaker-0.95.7/WINGs/wview.c
+Index: WINGs/wview.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wview.c
-+++ WindowMaker-0.95.7/WINGs/wview.c
+--- WINGs/wview.c.orig
++++ WINGs/wview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1054,10 +1054,10 @@ Index: WindowMaker-0.95.7/WINGs/wview.c
  #include "WINGsP.h"
  
  #include <X11/Xresource.h>
-Index: WindowMaker-0.95.7/WINGs/wwindow.c
+Index: WINGs/wwindow.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WINGs/wwindow.c
-+++ WindowMaker-0.95.7/WINGs/wwindow.c
+--- WINGs/wwindow.c.orig
++++ WINGs/wwindow.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1067,10 +1067,10 @@ Index: WindowMaker-0.95.7/WINGs/wwindow.c
  #include <X11/Xmd.h>
  
  #include "wconfig.h"
-Index: WindowMaker-0.95.7/WPrefs.app/Appearance.c
+Index: WPrefs.app/Appearance.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Appearance.c
-+++ WindowMaker-0.95.7/WPrefs.app/Appearance.c
+--- WPrefs.app/Appearance.c.orig
++++ WPrefs.app/Appearance.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1082,10 +1082,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Appearance.c
  #include "WPrefs.h"
  
  #include <unistd.h>
-Index: WindowMaker-0.95.7/WPrefs.app/Configurations.c
+Index: WPrefs.app/Configurations.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Configurations.c
-+++ WindowMaker-0.95.7/WPrefs.app/Configurations.c
+--- WPrefs.app/Configurations.c.orig
++++ WPrefs.app/Configurations.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1097,10 +1097,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Configurations.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.7/WPrefs.app/Expert.c
+Index: WPrefs.app/Expert.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Expert.c
-+++ WindowMaker-0.95.7/WPrefs.app/Expert.c
+--- WPrefs.app/Expert.c.orig
++++ WPrefs.app/Expert.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1112,10 +1112,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Expert.c
  #include "WPrefs.h"
  
  /* This structure containts the list of all the check-buttons to display in the
-Index: WindowMaker-0.95.7/WPrefs.app/Focus.c
+Index: WPrefs.app/Focus.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Focus.c
-+++ WindowMaker-0.95.7/WPrefs.app/Focus.c
+--- WPrefs.app/Focus.c.orig
++++ WPrefs.app/Focus.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1127,10 +1127,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Focus.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.7/WPrefs.app/FontSimple.c
+Index: WPrefs.app/FontSimple.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/FontSimple.c
-+++ WindowMaker-0.95.7/WPrefs.app/FontSimple.c
+--- WPrefs.app/FontSimple.c.orig
++++ WPrefs.app/FontSimple.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1142,10 +1142,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/FontSimple.c
  #include "WPrefs.h"
  #include <unistd.h>
  #include <fontconfig/fontconfig.h>
-Index: WindowMaker-0.95.7/WPrefs.app/Icons.c
+Index: WPrefs.app/Icons.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Icons.c
-+++ WindowMaker-0.95.7/WPrefs.app/Icons.c
+--- WPrefs.app/Icons.c.orig
++++ WPrefs.app/Icons.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1157,10 +1157,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Icons.c
  #include "WPrefs.h"
  
  
-Index: WindowMaker-0.95.7/WPrefs.app/KeyboardSettings.c
+Index: WPrefs.app/KeyboardSettings.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/KeyboardSettings.c
-+++ WindowMaker-0.95.7/WPrefs.app/KeyboardSettings.c
+--- WPrefs.app/KeyboardSettings.c.orig
++++ WPrefs.app/KeyboardSettings.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1172,10 +1172,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/KeyboardSettings.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.7/WPrefs.app/Menu.c
+Index: WPrefs.app/Menu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Menu.c
-+++ WindowMaker-0.95.7/WPrefs.app/Menu.c
+--- WPrefs.app/Menu.c.orig
++++ WPrefs.app/Menu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1187,10 +1187,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Menu.c
  #include "WPrefs.h"
  #include <assert.h>
  #include <ctype.h>
-Index: WindowMaker-0.95.7/WPrefs.app/MenuPreferences.c
+Index: WPrefs.app/MenuPreferences.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/MenuPreferences.c
-+++ WindowMaker-0.95.7/WPrefs.app/MenuPreferences.c
+--- WPrefs.app/MenuPreferences.c.orig
++++ WPrefs.app/MenuPreferences.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1202,10 +1202,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/MenuPreferences.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.7/WPrefs.app/MouseSettings.c
+Index: WPrefs.app/MouseSettings.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/MouseSettings.c
-+++ WindowMaker-0.95.7/WPrefs.app/MouseSettings.c
+--- WPrefs.app/MouseSettings.c.orig
++++ WPrefs.app/MouseSettings.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1217,10 +1217,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/MouseSettings.c
  #include "WPrefs.h"
  
  #include <X11/Xutil.h>
-Index: WindowMaker-0.95.7/WPrefs.app/Paths.c
+Index: WPrefs.app/Paths.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Paths.c
-+++ WindowMaker-0.95.7/WPrefs.app/Paths.c
+--- WPrefs.app/Paths.c.orig
++++ WPrefs.app/Paths.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1232,10 +1232,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Paths.c
  #include "WPrefs.h"
  #include <unistd.h>
  #include <assert.h>
-Index: WindowMaker-0.95.7/WPrefs.app/Preferences.c
+Index: WPrefs.app/Preferences.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Preferences.c
-+++ WindowMaker-0.95.7/WPrefs.app/Preferences.c
+--- WPrefs.app/Preferences.c.orig
++++ WPrefs.app/Preferences.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1247,10 +1247,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Preferences.c
  #include "WPrefs.h"
  
  
-Index: WindowMaker-0.95.7/WPrefs.app/TexturePanel.c
+Index: WPrefs.app/TexturePanel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/TexturePanel.c
-+++ WindowMaker-0.95.7/WPrefs.app/TexturePanel.c
+--- WPrefs.app/TexturePanel.c.orig
++++ WPrefs.app/TexturePanel.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1262,10 +1262,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/TexturePanel.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.7/WPrefs.app/Themes.c
+Index: WPrefs.app/Themes.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Themes.c
-+++ WindowMaker-0.95.7/WPrefs.app/Themes.c
+--- WPrefs.app/Themes.c.orig
++++ WPrefs.app/Themes.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1277,10 +1277,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Themes.c
  #include "WPrefs.h"
  
  #include <unistd.h>
-Index: WindowMaker-0.95.7/WPrefs.app/WPrefs.c
+Index: WPrefs.app/WPrefs.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/WPrefs.c
-+++ WindowMaker-0.95.7/WPrefs.app/WPrefs.c
+--- WPrefs.app/WPrefs.c.orig
++++ WPrefs.app/WPrefs.c
 @@ -21,6 +21,10 @@
  
  #include "config.h"
@@ -1292,10 +1292,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/WPrefs.c
  #include "WPrefs.h"
  #include <assert.h>
  
-Index: WindowMaker-0.95.7/WPrefs.app/WindowHandling.c
+Index: WPrefs.app/WindowHandling.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/WindowHandling.c
-+++ WindowMaker-0.95.7/WPrefs.app/WindowHandling.c
+--- WPrefs.app/WindowHandling.c.orig
++++ WPrefs.app/WindowHandling.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1307,10 +1307,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/WindowHandling.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.7/WPrefs.app/Workspace.c
+Index: WPrefs.app/Workspace.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/Workspace.c
-+++ WindowMaker-0.95.7/WPrefs.app/Workspace.c
+--- WPrefs.app/Workspace.c.orig
++++ WPrefs.app/Workspace.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1322,10 +1322,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/Workspace.c
  #include "WPrefs.h"
  
  typedef struct _Panel {
-Index: WindowMaker-0.95.7/WPrefs.app/double.c
+Index: WPrefs.app/double.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/double.c
-+++ WindowMaker-0.95.7/WPrefs.app/double.c
+--- WPrefs.app/double.c.orig
++++ WPrefs.app/double.c
 @@ -4,6 +4,10 @@
   *
   */
@@ -1337,10 +1337,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/double.c
  #include <WINGs/WINGsP.h>
  #include "WPrefs.h"
  
-Index: WindowMaker-0.95.7/WPrefs.app/editmenu.c
+Index: WPrefs.app/editmenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/editmenu.c
-+++ WindowMaker-0.95.7/WPrefs.app/editmenu.c
+--- WPrefs.app/editmenu.c.orig
++++ WPrefs.app/editmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1352,10 +1352,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/editmenu.c
  #include <WINGs/WINGsP.h>
  #include <WINGs/WUtil.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/WPrefs.app/main.c
+Index: WPrefs.app/main.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/main.c
-+++ WindowMaker-0.95.7/WPrefs.app/main.c
+--- WPrefs.app/main.c.orig
++++ WPrefs.app/main.c
 @@ -20,6 +20,10 @@
  
  #include "config.h"
@@ -1367,10 +1367,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/main.c
  #include "WPrefs.h"
  
  #include <assert.h>
-Index: WindowMaker-0.95.7/WPrefs.app/xmodifier.c
+Index: WPrefs.app/xmodifier.c
 ===================================================================
---- WindowMaker-0.95.7.orig/WPrefs.app/xmodifier.c
-+++ WindowMaker-0.95.7/WPrefs.app/xmodifier.c
+--- WPrefs.app/xmodifier.c.orig
++++ WPrefs.app/xmodifier.c
 @@ -31,6 +31,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   Boston, MA 02110-1301 USA. */
@@ -1382,10 +1382,10 @@ Index: WindowMaker-0.95.7/WPrefs.app/xmodifier.c
  #include <string.h>
  #include <strings.h>
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/configure.ac
+Index: configure.ac
 ===================================================================
---- WindowMaker-0.95.7.orig/configure.ac
-+++ WindowMaker-0.95.7/configure.ac
+--- configure.ac.orig
++++ configure.ac
 @@ -94,7 +94,9 @@ AC_SUBST(WUTIL_VERSION)
  
  dnl Checks for programs
@@ -1397,10 +1397,10 @@ Index: WindowMaker-0.95.7/configure.ac
  WM_PROG_CC_C11
  AC_PROG_LN_S
  AC_PROG_GCC_TRADITIONAL
-Index: WindowMaker-0.95.7/src/actions.c
+Index: src/actions.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/actions.c
-+++ WindowMaker-0.95.7/src/actions.c
+--- src/actions.c.orig
++++ src/actions.c
 @@ -21,6 +21,10 @@
   *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1412,10 +1412,10 @@ Index: WindowMaker-0.95.7/src/actions.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/appicon.c
+Index: src/appicon.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/appicon.c
-+++ WindowMaker-0.95.7/src/appicon.c
+--- src/appicon.c.orig
++++ src/appicon.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1427,10 +1427,10 @@ Index: WindowMaker-0.95.7/src/appicon.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/application.c
+Index: src/application.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/application.c
-+++ WindowMaker-0.95.7/src/application.c
+--- src/application.c.orig
++++ src/application.c
 @@ -18,6 +18,10 @@
   *  with this program; if not, write to the Free Software Foundation, Inc.,
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -1442,10 +1442,10 @@ Index: WindowMaker-0.95.7/src/application.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/appmenu.c
+Index: src/appmenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/appmenu.c
-+++ WindowMaker-0.95.7/src/appmenu.c
+--- src/appmenu.c.orig
++++ src/appmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1457,10 +1457,10 @@ Index: WindowMaker-0.95.7/src/appmenu.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/balloon.c
+Index: src/balloon.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/balloon.c
-+++ WindowMaker-0.95.7/src/balloon.c
+--- src/balloon.c.orig
++++ src/balloon.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1472,10 +1472,10 @@ Index: WindowMaker-0.95.7/src/balloon.c
  #include "wconfig.h"
  
  #ifdef BALLOON_TEXT
-Index: WindowMaker-0.95.7/src/client.c
+Index: src/client.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/client.c
-+++ WindowMaker-0.95.7/src/client.c
+--- src/client.c.orig
++++ src/client.c
 @@ -17,6 +17,10 @@
   *  with this program; if not, write to the Free Software Foundation, Inc.,
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -1487,10 +1487,10 @@ Index: WindowMaker-0.95.7/src/client.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/colormap.c
+Index: src/colormap.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/colormap.c
-+++ WindowMaker-0.95.7/src/colormap.c
+--- src/colormap.c.orig
++++ src/colormap.c
 @@ -23,6 +23,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1502,10 +1502,10 @@ Index: WindowMaker-0.95.7/src/colormap.c
  #include "wconfig.h"
  
  #include "WindowMaker.h"
-Index: WindowMaker-0.95.7/src/cycling.c
+Index: src/cycling.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/cycling.c
-+++ WindowMaker-0.95.7/src/cycling.c
+--- src/cycling.c.orig
++++ src/cycling.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1517,10 +1517,10 @@ Index: WindowMaker-0.95.7/src/cycling.c
  #include "wconfig.h"
  
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/src/defaults.c
+Index: src/defaults.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/defaults.c
-+++ WindowMaker-0.95.7/src/defaults.c
+--- src/defaults.c.orig
++++ src/defaults.c
 @@ -22,6 +22,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1532,10 +1532,10 @@ Index: WindowMaker-0.95.7/src/defaults.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/dialog.c
+Index: src/dialog.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/dialog.c
-+++ WindowMaker-0.95.7/src/dialog.c
+--- src/dialog.c.orig
++++ src/dialog.c
 @@ -21,6 +21,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1547,10 +1547,10 @@ Index: WindowMaker-0.95.7/src/dialog.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/dock.c
+Index: src/dock.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/dock.c
-+++ WindowMaker-0.95.7/src/dock.c
+--- src/dock.c.orig
++++ src/dock.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1562,10 +1562,10 @@ Index: WindowMaker-0.95.7/src/dock.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/dockedapp.c
+Index: src/dockedapp.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/dockedapp.c
-+++ WindowMaker-0.95.7/src/dockedapp.c
+--- src/dockedapp.c.orig
++++ src/dockedapp.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1577,10 +1577,10 @@ Index: WindowMaker-0.95.7/src/dockedapp.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/event.c
+Index: src/event.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/event.c
-+++ WindowMaker-0.95.7/src/event.c
+--- src/event.c.orig
++++ src/event.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1592,10 +1592,10 @@ Index: WindowMaker-0.95.7/src/event.c
  #include "wconfig.h"
  
  #ifdef HAVE_INOTIFY
-Index: WindowMaker-0.95.7/src/framewin.c
+Index: src/framewin.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/framewin.c
-+++ WindowMaker-0.95.7/src/framewin.c
+--- src/framewin.c.orig
++++ src/framewin.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1607,10 +1607,10 @@ Index: WindowMaker-0.95.7/src/framewin.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/geomview.c
+Index: src/geomview.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/geomview.c
-+++ WindowMaker-0.95.7/src/geomview.c
+--- src/geomview.c.orig
++++ src/geomview.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1620,10 +1620,10 @@ Index: WindowMaker-0.95.7/src/geomview.c
  #include <WINGs/WINGsP.h>
  
  #include "geomview.h"
-Index: WindowMaker-0.95.7/src/icon.c
+Index: src/icon.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/icon.c
-+++ WindowMaker-0.95.7/src/icon.c
+--- src/icon.c.orig
++++ src/icon.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1635,10 +1635,10 @@ Index: WindowMaker-0.95.7/src/icon.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/main.c
+Index: src/main.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/main.c
-+++ WindowMaker-0.95.7/src/main.c
+--- src/main.c.orig
++++ src/main.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1650,10 +1650,10 @@ Index: WindowMaker-0.95.7/src/main.c
  #include "wconfig.h"
  
  #ifdef HAVE_INOTIFY
-Index: WindowMaker-0.95.7/src/menu.c
+Index: src/menu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/menu.c
-+++ WindowMaker-0.95.7/src/menu.c
+--- src/menu.c.orig
++++ src/menu.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1665,10 +1665,10 @@ Index: WindowMaker-0.95.7/src/menu.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/misc.c
+Index: src/misc.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/misc.c
-+++ WindowMaker-0.95.7/src/misc.c
+--- src/misc.c.orig
++++ src/misc.c
 @@ -17,6 +17,10 @@
   *  with this program; if not, write to the Free Software Foundation, Inc.,
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -1680,10 +1680,10 @@ Index: WindowMaker-0.95.7/src/misc.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/monitor.c
+Index: src/monitor.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/monitor.c
-+++ WindowMaker-0.95.7/src/monitor.c
+--- src/monitor.c.orig
++++ src/monitor.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1695,10 +1695,10 @@ Index: WindowMaker-0.95.7/src/monitor.c
  #include "wconfig.h"
  #include <unistd.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/src/motif.c
+Index: src/motif.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/motif.c
-+++ WindowMaker-0.95.7/src/motif.c
+--- src/motif.c.orig
++++ src/motif.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1710,10 +1710,10 @@ Index: WindowMaker-0.95.7/src/motif.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/moveres.c
+Index: src/moveres.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/moveres.c
-+++ WindowMaker-0.95.7/src/moveres.c
+--- src/moveres.c.orig
++++ src/moveres.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1725,10 +1725,10 @@ Index: WindowMaker-0.95.7/src/moveres.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/osdep_bsd.c
+Index: src/osdep_bsd.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/osdep_bsd.c
-+++ WindowMaker-0.95.7/src/osdep_bsd.c
+--- src/osdep_bsd.c.orig
++++ src/osdep_bsd.c
 @@ -11,6 +11,10 @@
  #else /* OPENBSD || NETBSD */
  #   include <sys/param.h>
@@ -1740,10 +1740,10 @@ Index: WindowMaker-0.95.7/src/osdep_bsd.c
  #include <sys/sysctl.h>
  
  #include <assert.h>
-Index: WindowMaker-0.95.7/src/osdep_darwin.c
+Index: src/osdep_darwin.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/osdep_darwin.c
-+++ WindowMaker-0.95.7/src/osdep_darwin.c
+--- src/osdep_darwin.c.orig
++++ src/osdep_darwin.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1753,10 +1753,10 @@ Index: WindowMaker-0.95.7/src/osdep_darwin.c
  #include <sys/types.h>
  #include <sys/sysctl.h>
  
-Index: WindowMaker-0.95.7/src/osdep_linux.c
+Index: src/osdep_linux.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/osdep_linux.c
-+++ WindowMaker-0.95.7/src/osdep_linux.c
+--- src/osdep_linux.c.orig
++++ src/osdep_linux.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1766,10 +1766,10 @@ Index: WindowMaker-0.95.7/src/osdep_linux.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/src/osdep_stub.c
+Index: src/osdep_stub.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/osdep_stub.c
-+++ WindowMaker-0.95.7/src/osdep_stub.c
+--- src/osdep_stub.c.orig
++++ src/osdep_stub.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -1779,10 +1779,10 @@ Index: WindowMaker-0.95.7/src/osdep_stub.c
  #include <sys/utsname.h>
  
  #include <WINGs/WUtil.h>
-Index: WindowMaker-0.95.7/src/pixmap.c
+Index: src/pixmap.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/pixmap.c
-+++ WindowMaker-0.95.7/src/pixmap.c
+--- src/pixmap.c.orig
++++ src/pixmap.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1794,10 +1794,10 @@ Index: WindowMaker-0.95.7/src/pixmap.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/placement.c
+Index: src/placement.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/placement.c
-+++ WindowMaker-0.95.7/src/placement.c
+--- src/placement.c.orig
++++ src/placement.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1809,10 +1809,10 @@ Index: WindowMaker-0.95.7/src/placement.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/properties.c
+Index: src/properties.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/properties.c
-+++ WindowMaker-0.95.7/src/properties.c
+--- src/properties.c.orig
++++ src/properties.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1824,10 +1824,10 @@ Index: WindowMaker-0.95.7/src/properties.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/resources.c
+Index: src/resources.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/resources.c
-+++ WindowMaker-0.95.7/src/resources.c
+--- src/resources.c.orig
++++ src/resources.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1839,10 +1839,10 @@ Index: WindowMaker-0.95.7/src/resources.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/rootmenu.c
+Index: src/rootmenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/rootmenu.c
-+++ WindowMaker-0.95.7/src/rootmenu.c
+--- src/rootmenu.c.orig
++++ src/rootmenu.c
 @@ -21,6 +21,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1854,10 +1854,10 @@ Index: WindowMaker-0.95.7/src/rootmenu.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/screen.c
+Index: src/screen.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/screen.c
-+++ WindowMaker-0.95.7/src/screen.c
+--- src/screen.c.orig
++++ src/screen.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1869,10 +1869,10 @@ Index: WindowMaker-0.95.7/src/screen.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/session.c
+Index: src/session.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/session.c
-+++ WindowMaker-0.95.7/src/session.c
+--- src/session.c.orig
++++ src/session.c
 @@ -57,6 +57,10 @@
   * if the Die message is received, exit.
   */
@@ -1884,10 +1884,10 @@ Index: WindowMaker-0.95.7/src/session.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/shutdown.c
+Index: src/shutdown.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/shutdown.c
-+++ WindowMaker-0.95.7/src/shutdown.c
+--- src/shutdown.c.orig
++++ src/shutdown.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1899,10 +1899,10 @@ Index: WindowMaker-0.95.7/src/shutdown.c
  #include "wconfig.h"
  
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/src/stacking.c
+Index: src/stacking.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/stacking.c
-+++ WindowMaker-0.95.7/src/stacking.c
+--- src/stacking.c.orig
++++ src/stacking.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1914,10 +1914,10 @@ Index: WindowMaker-0.95.7/src/stacking.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/startup.c
+Index: src/startup.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/startup.c
-+++ WindowMaker-0.95.7/src/startup.c
+--- src/startup.c.orig
++++ src/startup.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1929,10 +1929,10 @@ Index: WindowMaker-0.95.7/src/startup.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/superfluous.c
+Index: src/superfluous.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/superfluous.c
-+++ WindowMaker-0.95.7/src/superfluous.c
+--- src/superfluous.c.orig
++++ src/superfluous.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1944,10 +1944,10 @@ Index: WindowMaker-0.95.7/src/superfluous.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/switchmenu.c
+Index: src/switchmenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/switchmenu.c
-+++ WindowMaker-0.95.7/src/switchmenu.c
+--- src/switchmenu.c.orig
++++ src/switchmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1959,10 +1959,10 @@ Index: WindowMaker-0.95.7/src/switchmenu.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/switchpanel.c
+Index: src/switchpanel.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/switchpanel.c
-+++ WindowMaker-0.95.7/src/switchpanel.c
+--- src/switchpanel.c.orig
++++ src/switchpanel.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1974,10 +1974,10 @@ Index: WindowMaker-0.95.7/src/switchpanel.c
  #include "wconfig.h"
  
  #include <stdint.h>
-Index: WindowMaker-0.95.7/src/texture.c
+Index: src/texture.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/texture.c
-+++ WindowMaker-0.95.7/src/texture.c
+--- src/texture.c.orig
++++ src/texture.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -1989,10 +1989,10 @@ Index: WindowMaker-0.95.7/src/texture.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/usermenu.c
+Index: src/usermenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/usermenu.c
-+++ WindowMaker-0.95.7/src/usermenu.c
+--- src/usermenu.c.orig
++++ src/usermenu.c
 @@ -56,6 +56,10 @@
   *
   */
@@ -2004,10 +2004,10 @@ Index: WindowMaker-0.95.7/src/usermenu.c
  #include "wconfig.h"
  
  #ifdef USER_MENU
-Index: WindowMaker-0.95.7/src/wcore.c
+Index: src/wcore.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/wcore.c
-+++ WindowMaker-0.95.7/src/wcore.c
+--- src/wcore.c.orig
++++ src/wcore.c
 @@ -18,6 +18,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2019,10 +2019,10 @@ Index: WindowMaker-0.95.7/src/wcore.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/wdefaults.c
+Index: src/wdefaults.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/wdefaults.c
-+++ WindowMaker-0.95.7/src/wdefaults.c
+--- src/wdefaults.c.orig
++++ src/wdefaults.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2034,10 +2034,10 @@ Index: WindowMaker-0.95.7/src/wdefaults.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/window.c
+Index: src/window.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/window.c
-+++ WindowMaker-0.95.7/src/window.c
+--- src/window.c.orig
++++ src/window.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2049,10 +2049,10 @@ Index: WindowMaker-0.95.7/src/window.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/winmenu.c
+Index: src/winmenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/winmenu.c
-+++ WindowMaker-0.95.7/src/winmenu.c
+--- src/winmenu.c.orig
++++ src/winmenu.c
 @@ -19,6 +19,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2064,10 +2064,10 @@ Index: WindowMaker-0.95.7/src/winmenu.c
  #include "wconfig.h"
  
  #include <stdio.h>
-Index: WindowMaker-0.95.7/src/winspector.c
+Index: src/winspector.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/winspector.c
-+++ WindowMaker-0.95.7/src/winspector.c
+--- src/winspector.c.orig
++++ src/winspector.c
 @@ -20,6 +20,10 @@
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2079,10 +2079,10 @@ Index: WindowMaker-0.95.7/src/winspector.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/wmspec.c
+Index: src/wmspec.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/wmspec.c
-+++ WindowMaker-0.95.7/src/wmspec.c
+--- src/wmspec.c.orig
++++ src/wmspec.c
 @@ -28,6 +28,10 @@
   * return to be Success is not enough. -Dan
   */
@@ -2094,10 +2094,10 @@ Index: WindowMaker-0.95.7/src/wmspec.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/workspace.c
+Index: src/workspace.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/workspace.c
-+++ WindowMaker-0.95.7/src/workspace.c
+--- src/workspace.c.orig
++++ src/workspace.c
 @@ -18,6 +18,10 @@
   *  with this program; if not, write to the Free Software Foundation, Inc.,
   *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
@@ -2109,13 +2109,13 @@ Index: WindowMaker-0.95.7/src/workspace.c
  #include "wconfig.h"
  
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/src/xinerama.c
+Index: src/xinerama.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/xinerama.c
-+++ WindowMaker-0.95.7/src/xinerama.c
-@@ -18,6 +18,10 @@
-  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
+--- src/xinerama.c.orig
++++ src/xinerama.c
+@@ -20,6 +20,10 @@
+ 
+ #include <stdlib.h>
  
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -2124,10 +2124,10 @@ Index: WindowMaker-0.95.7/src/xinerama.c
  #include "wconfig.h"
  
  #include "xinerama.h"
-Index: WindowMaker-0.95.7/src/xmodifier.c
+Index: src/xmodifier.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/xmodifier.c
-+++ WindowMaker-0.95.7/src/xmodifier.c
+--- src/xmodifier.c.orig
++++ src/xmodifier.c
 @@ -27,6 +27,10 @@ Perpetrator: Sudish Joseph <sj@eng.minds
   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   Boston, MA 02110-1301 USA. */
@@ -2139,10 +2139,10 @@ Index: WindowMaker-0.95.7/src/xmodifier.c
  #include "wconfig.h"
  
  #include <string.h>
-Index: WindowMaker-0.95.7/src/xutil.c
+Index: src/xutil.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/xutil.c
-+++ WindowMaker-0.95.7/src/xutil.c
+--- src/xutil.c.orig
++++ src/xutil.c
 @@ -19,6 +19,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2154,10 +2154,10 @@ Index: WindowMaker-0.95.7/src/xutil.c
  #include <X11/Xlib.h>
  #include <stdlib.h>
  #include <X11/Xutil.h>
-Index: WindowMaker-0.95.7/test/notest.c
+Index: test/notest.c
 ===================================================================
---- WindowMaker-0.95.7.orig/test/notest.c
-+++ WindowMaker-0.95.7/test/notest.c
+--- test/notest.c.orig
++++ test/notest.c
 @@ -3,6 +3,10 @@
   * TODO: remake
   */
@@ -2169,10 +2169,10 @@ Index: WindowMaker-0.95.7/test/notest.c
  #include <stdio.h>
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
-Index: WindowMaker-0.95.7/test/wtest.c
+Index: test/wtest.c
 ===================================================================
---- WindowMaker-0.95.7.orig/test/wtest.c
-+++ WindowMaker-0.95.7/test/wtest.c
+--- test/wtest.c.orig
++++ test/wtest.c
 @@ -10,6 +10,10 @@
  
  #include "config.h"
@@ -2184,10 +2184,10 @@ Index: WindowMaker-0.95.7/test/wtest.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/util/convertfonts.c
+Index: util/convertfonts.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/convertfonts.c
-+++ WindowMaker-0.95.7/util/convertfonts.c
+--- util/convertfonts.c.orig
++++ util/convertfonts.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2199,10 +2199,10 @@ Index: WindowMaker-0.95.7/util/convertfonts.c
  #include <sys/stat.h>
  
  #include <getopt.h>
-Index: WindowMaker-0.95.7/util/fontconv.c
+Index: util/fontconv.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/fontconv.c
-+++ WindowMaker-0.95.7/util/fontconv.c
+--- util/fontconv.c.orig
++++ util/fontconv.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2212,10 +2212,10 @@ Index: WindowMaker-0.95.7/util/fontconv.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.7/util/geticonset.c
+Index: util/geticonset.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/geticonset.c
-+++ WindowMaker-0.95.7/util/geticonset.c
+--- util/geticonset.c.orig
++++ util/geticonset.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2227,10 +2227,10 @@ Index: WindowMaker-0.95.7/util/geticonset.c
  #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/util/getstyle.c
+Index: util/getstyle.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/getstyle.c
-+++ WindowMaker-0.95.7/util/getstyle.c
+--- util/getstyle.c.orig
++++ util/getstyle.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2242,10 +2242,10 @@ Index: WindowMaker-0.95.7/util/getstyle.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/util/seticons.c
+Index: util/seticons.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/seticons.c
-+++ WindowMaker-0.95.7/util/seticons.c
+--- util/seticons.c.orig
++++ util/seticons.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2257,10 +2257,10 @@ Index: WindowMaker-0.95.7/util/seticons.c
  #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/util/setstyle.c
+Index: util/setstyle.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/setstyle.c
-+++ WindowMaker-0.95.7/util/setstyle.c
+--- util/setstyle.c.orig
++++ util/setstyle.c
 @@ -25,6 +25,10 @@
  
  #include "config.h"
@@ -2272,10 +2272,10 @@ Index: WindowMaker-0.95.7/util/setstyle.c
  #include <sys/stat.h>
  
  #include <getopt.h>
-Index: WindowMaker-0.95.7/util/wdread.c
+Index: util/wdread.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wdread.c
-+++ WindowMaker-0.95.7/util/wdread.c
+--- util/wdread.c.orig
++++ util/wdread.c
 @@ -29,6 +29,10 @@
   */
  #include "config.h"
@@ -2287,10 +2287,10 @@ Index: WindowMaker-0.95.7/util/wdread.c
  #include <getopt.h>
  #include <limits.h>
  #include <stdio.h>
-Index: WindowMaker-0.95.7/util/wdwrite.c
+Index: util/wdwrite.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wdwrite.c
-+++ WindowMaker-0.95.7/util/wdwrite.c
+--- util/wdwrite.c.orig
++++ util/wdwrite.c
 @@ -28,6 +28,10 @@
   */
  #include "config.h"
@@ -2302,10 +2302,10 @@ Index: WindowMaker-0.95.7/util/wdwrite.c
  #include <getopt.h>
  #include <limits.h>
  #include <stdio.h>
-Index: WindowMaker-0.95.7/util/wmagnify.c
+Index: util/wmagnify.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wmagnify.c
-+++ WindowMaker-0.95.7/util/wmagnify.c
+--- util/wmagnify.c.orig
++++ util/wmagnify.c
 @@ -7,6 +7,10 @@
   */
  #include <config.h>
@@ -2317,10 +2317,10 @@ Index: WindowMaker-0.95.7/util/wmagnify.c
  #include <X11/Xproto.h>
  
  #include <WINGs/WINGs.h>
-Index: WindowMaker-0.95.7/util/wmgenmenu.c
+Index: util/wmgenmenu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wmgenmenu.c
-+++ WindowMaker-0.95.7/util/wmgenmenu.c
+--- util/wmgenmenu.c.orig
++++ util/wmgenmenu.c
 @@ -6,6 +6,10 @@
  
  #include "config.h"
@@ -2332,10 +2332,10 @@ Index: WindowMaker-0.95.7/util/wmgenmenu.c
  #include <ctype.h>
  #include <getopt.h>
  #include <limits.h>
-Index: WindowMaker-0.95.7/util/wmmenugen.c
+Index: util/wmmenugen.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wmmenugen.c
-+++ WindowMaker-0.95.7/util/wmmenugen.c
+--- util/wmmenugen.c.orig
++++ util/wmmenugen.c
 @@ -18,6 +18,10 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2347,10 +2347,10 @@ Index: WindowMaker-0.95.7/util/wmmenugen.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/util/wmmenugen_misc.c
+Index: util/wmmenugen_misc.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wmmenugen_misc.c
-+++ WindowMaker-0.95.7/util/wmmenugen_misc.c
+--- util/wmmenugen_misc.c.orig
++++ util/wmmenugen_misc.c
 @@ -20,6 +20,10 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2362,10 +2362,10 @@ Index: WindowMaker-0.95.7/util/wmmenugen_misc.c
  #include <libgen.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.7/util/wmmenugen_parse_wmconfig.c
+Index: util/wmmenugen_parse_wmconfig.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wmmenugen_parse_wmconfig.c
-+++ WindowMaker-0.95.7/util/wmmenugen_parse_wmconfig.c
+--- util/wmmenugen_parse_wmconfig.c.orig
++++ util/wmmenugen_parse_wmconfig.c
 @@ -20,6 +20,10 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
@@ -2377,10 +2377,10 @@ Index: WindowMaker-0.95.7/util/wmmenugen_parse_wmconfig.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/util/wmmenugen_parse_xdg.c
+Index: util/wmmenugen_parse_xdg.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wmmenugen_parse_xdg.c
-+++ WindowMaker-0.95.7/util/wmmenugen_parse_xdg.c
+--- util/wmmenugen_parse_xdg.c.orig
++++ util/wmmenugen_parse_xdg.c
 @@ -36,6 +36,10 @@
   * Basic validation of the .desktop file is done.
   */
@@ -2392,10 +2392,10 @@ Index: WindowMaker-0.95.7/util/wmmenugen_parse_xdg.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: WindowMaker-0.95.7/util/wxcopy.c
+Index: util/wxcopy.c
 ===================================================================
---- WindowMaker-0.95.7.orig/util/wxcopy.c
-+++ WindowMaker-0.95.7/util/wxcopy.c
+--- util/wxcopy.c.orig
++++ util/wxcopy.c
 @@ -18,6 +18,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2407,10 +2407,10 @@ Index: WindowMaker-0.95.7/util/wxcopy.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.7/wmlib/app.c
+Index: wmlib/app.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wmlib/app.c
-+++ WindowMaker-0.95.7/wmlib/app.c
+--- wmlib/app.c.orig
++++ wmlib/app.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2422,10 +2422,10 @@ Index: WindowMaker-0.95.7/wmlib/app.c
  #include <X11/Xlib.h>
  #include <stdlib.h>
  #include <string.h>
-Index: WindowMaker-0.95.7/wmlib/command.c
+Index: wmlib/command.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wmlib/command.c
-+++ WindowMaker-0.95.7/wmlib/command.c
+--- wmlib/command.c.orig
++++ wmlib/command.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2437,10 +2437,10 @@ Index: WindowMaker-0.95.7/wmlib/command.c
  #include <X11/Xlib.h>
  #include <stdlib.h>
  
-Index: WindowMaker-0.95.7/wmlib/event.c
+Index: wmlib/event.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wmlib/event.c
-+++ WindowMaker-0.95.7/wmlib/event.c
+--- wmlib/event.c.orig
++++ wmlib/event.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2452,10 +2452,10 @@ Index: WindowMaker-0.95.7/wmlib/event.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <X11/Xlib.h>
-Index: WindowMaker-0.95.7/wmlib/menu.c
+Index: wmlib/menu.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wmlib/menu.c
-+++ WindowMaker-0.95.7/wmlib/menu.c
+--- wmlib/menu.c.orig
++++ wmlib/menu.c
 @@ -20,6 +20,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2467,10 +2467,10 @@ Index: WindowMaker-0.95.7/wmlib/menu.c
  #include <stdlib.h>
  #include <stdio.h>
  #include <string.h>
-Index: WindowMaker-0.95.7/wrlib/alpha_combine.c
+Index: wrlib/alpha_combine.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wrlib/alpha_combine.c
-+++ WindowMaker-0.95.7/wrlib/alpha_combine.c
+--- wrlib/alpha_combine.c.orig
++++ wrlib/alpha_combine.c
 @@ -18,6 +18,10 @@
   *  MA 02110-1301, USA.
   */
@@ -2482,10 +2482,10 @@ Index: WindowMaker-0.95.7/wrlib/alpha_combine.c
  #include "wraster.h"
  
  void RCombineAlpha(unsigned char *d, unsigned char *s, int s_has_alpha,
-Index: WindowMaker-0.95.7/wrlib/tests/testdraw.c
+Index: wrlib/tests/testdraw.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wrlib/tests/testdraw.c
-+++ WindowMaker-0.95.7/wrlib/tests/testdraw.c
+--- wrlib/tests/testdraw.c.orig
++++ wrlib/tests/testdraw.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2495,10 +2495,10 @@ Index: WindowMaker-0.95.7/wrlib/tests/testdraw.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdio.h>
-Index: WindowMaker-0.95.7/wrlib/tests/testgrad.c
+Index: wrlib/tests/testgrad.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wrlib/tests/testgrad.c
-+++ WindowMaker-0.95.7/wrlib/tests/testgrad.c
+--- wrlib/tests/testgrad.c.orig
++++ wrlib/tests/testgrad.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2508,10 +2508,10 @@ Index: WindowMaker-0.95.7/wrlib/tests/testgrad.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdio.h>
-Index: WindowMaker-0.95.7/wrlib/tests/testrot.c
+Index: wrlib/tests/testrot.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wrlib/tests/testrot.c
-+++ WindowMaker-0.95.7/wrlib/tests/testrot.c
+--- wrlib/tests/testrot.c.orig
++++ wrlib/tests/testrot.c
 @@ -1,4 +1,8 @@
  
 +#ifdef HAVE_CONFIG_H
@@ -2521,10 +2521,10 @@ Index: WindowMaker-0.95.7/wrlib/tests/testrot.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/wrlib/tests/view.c
+Index: wrlib/tests/view.c
 ===================================================================
---- WindowMaker-0.95.7.orig/wrlib/tests/view.c
-+++ WindowMaker-0.95.7/wrlib/tests/view.c
+--- wrlib/tests/view.c.orig
++++ wrlib/tests/view.c
 @@ -1,3 +1,7 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -2533,10 +2533,10 @@ Index: WindowMaker-0.95.7/wrlib/tests/view.c
  #include <X11/Xlib.h>
  #include "wraster.h"
  #include <stdlib.h>
-Index: WindowMaker-0.95.7/src/xdnd.c
+Index: src/xdnd.c
 ===================================================================
---- WindowMaker-0.95.7.orig/src/xdnd.c
-+++ WindowMaker-0.95.7/src/xdnd.c
+--- src/xdnd.c.orig
++++ src/xdnd.c
 @@ -20,7 +20,9 @@
  
  /* Many part of code are ripped of an example from JX's site */