diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/configure.ac WordNet-3.0.fhs/configure.ac
--- WordNet-3.0/configure.ac	2007-01-20 20:59:24.000000000 +0100
+++ WordNet-3.0.fhs/configure.ac	2007-06-05 11:20:35.000000000 +0200
@@ -40,7 +40,7 @@
 fi
 AC_SUBST(ac_prefix)
 AH_TEMPLATE([DEFAULTPATH],[The default search path for WordNet data files])
-AC_DEFINE_UNQUOTED(DEFAULTPATH, ["$ac_prefix/dict"], [Default installation prefix.])
+AC_DEFINE_UNQUOTED(DEFAULTPATH, ["$datadir/WordNet/dict"], [Default installation prefix.])
 
 #AC_DEFINE_UNQUOTED(DEFAULTPATH,"${prefix}/dict")
 
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/dict/Makefile.am WordNet-3.0.fhs/dict/Makefile.am
--- WordNet-3.0/dict/Makefile.am	2006-12-18 22:30:07.000000000 +0100
+++ WordNet-3.0.fhs/dict/Makefile.am	2007-06-05 10:41:42.000000000 +0200
@@ -1,2 +1,2 @@
-dictdir = $(prefix)/dict
+dictdir = $(pkgdatadir)/dict
 dict_DATA = adj.exc adv.exc cntlist cntlist.rev data.adj data.adv data.noun data.verb frames.vrb index.adj index.adv index.noun index.sense index.verb log.grind.3.0 noun.exc sentidx.vrb sents.vrb verb.Framestext verb.exc lexnames
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/doc/html/Makefile.am WordNet-3.0.fhs/doc/html/Makefile.am
--- WordNet-3.0/doc/html/Makefile.am	2006-12-14 23:59:43.000000000 +0100
+++ WordNet-3.0.fhs/doc/html/Makefile.am	2007-06-05 10:41:42.000000000 +0200
@@ -1,2 +1 @@
-htmldir = $(prefix)/doc/html
-html_DATA = binsrch.3WN.html cntlist.5WN.html grind.1WN.html lexnames.5WN.html morph.3WN.html morphy.7WN.html senseidx.5WN.html uniqbeg.7WN.html wn.1WN.html wnb.1WN.html wndb.5WN.html wngloss.7WN.html wngroups.7WN.html wninput.5WN.html wnintro.1WN.html wnintro.3WN.html wnintro.5WN.html wnintro.7WN.html wnlicens.7WN.html wnpkgs.7WN.html wnsearch.3WN.html wnstats.7WN.html wnutil.3WN.html
+noinst_DATA = binsrch.3WN.html cntlist.5WN.html grind.1WN.html lexnames.5WN.html morph.3WN.html morphy.7WN.html senseidx.5WN.html uniqbeg.7WN.html wn.1WN.html wnb.1WN.html wndb.5WN.html wngloss.7WN.html wngroups.7WN.html wninput.5WN.html wnintro.1WN.html wnintro.3WN.html wnintro.5WN.html wnintro.7WN.html wnlicens.7WN.html wnpkgs.7WN.html wnsearch.3WN.html wnstats.7WN.html wnutil.3WN.html
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/doc/pdf/Makefile.am WordNet-3.0.fhs/doc/pdf/Makefile.am
--- WordNet-3.0/doc/pdf/Makefile.am	2006-11-14 22:27:27.000000000 +0100
+++ WordNet-3.0.fhs/doc/pdf/Makefile.am	2007-06-05 10:41:42.000000000 +0200
@@ -1,2 +1 @@
-pdfdir=$(prefix)/doc/pdf
-pdf_DATA =binsrch.3.pdf cntlist.5.pdf grind.1.pdf lexnames.5.pdf morph.3.pdf morphy.7.pdf senseidx.5.pdf uniqbeg.7.pdf wn.1.pdf wnb.1.pdf wndb.5.pdf wngloss.7.pdf wngroups.7.pdf wninput.5.pdf wnintro.1.pdf wnintro.3.pdf wnintro.5.pdf wnintro.7.pdf wnlicens.7.pdf wnpkgs.7.pdf wnsearch.3.pdf wnstats.7.pdf wnutil.3.pdf
+noinst_DATA =binsrch.3.pdf cntlist.5.pdf grind.1.pdf lexnames.5.pdf morph.3.pdf morphy.7.pdf senseidx.5.pdf uniqbeg.7.pdf wn.1.pdf wnb.1.pdf wndb.5.pdf wngloss.7.pdf wngroups.7.pdf wninput.5.pdf wnintro.1.pdf wnintro.3.pdf wnintro.5.pdf wnintro.7.pdf wnlicens.7.pdf wnpkgs.7.pdf wnsearch.3.pdf wnstats.7.pdf wnutil.3.pdf
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/doc/ps/Makefile.am WordNet-3.0.fhs/doc/ps/Makefile.am
--- WordNet-3.0/doc/ps/Makefile.am	2006-11-14 22:27:31.000000000 +0100
+++ WordNet-3.0.fhs/doc/ps/Makefile.am	2007-06-05 10:41:42.000000000 +0200
@@ -1,2 +1 @@
-psdir = $(prefix)/doc/ps
-ps_DATA = binsrch.3.ps cntlist.5.ps grind.1.ps lexnames.5.ps morph.3.ps morphy.7.ps senseidx.5.ps uniqbeg.7.ps wn.1.ps wnb.1.ps wndb.5.ps wngloss.7.ps wngroups.7.ps wninput.5.ps wnintro.1.ps wnintro.3.ps wnintro.5.ps wnintro.7.ps wnlicens.7.ps wnpkgs.7.ps wnsearch.3.ps wnstats.7.ps wnutil.3.ps
+noinst_DATA = binsrch.3.ps cntlist.5.ps grind.1.ps lexnames.5.ps morph.3.ps morphy.7.ps senseidx.5.ps uniqbeg.7.ps wn.1.ps wnb.1.ps wndb.5.ps wngloss.7.ps wngroups.7.ps wninput.5.ps wnintro.1.ps wnintro.3.ps wnintro.5.ps wnintro.7.ps wnlicens.7.ps wnpkgs.7.ps wnsearch.3.ps wnstats.7.ps wnutil.3.ps
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/include/wn.h WordNet-3.0.fhs/include/wn.h
--- WordNet-3.0/include/wn.h	2007-01-03 22:51:35.000000000 +0100
+++ WordNet-3.0.fhs/include/wn.h	2007-06-05 10:51:25.000000000 +0200
@@ -29,7 +29,7 @@
 #else
 #define DICTDIR         "/dict"
 #ifndef DEFAULTPATH
-#define DEFAULTPATH	"/usr/local/WordNet-3.0/dict"
+#define DEFAULTPATH	"/usr/share/WordNet/dict"
 #endif
 #define DATAFILE	"%s/data.%s"
 #define INDEXFILE	"%s/index.%s"
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/lib/wnres/Makefile.am WordNet-3.0.fhs/lib/wnres/Makefile.am
--- WordNet-3.0/lib/wnres/Makefile.am	2006-11-14 22:25:17.000000000 +0100
+++ WordNet-3.0.fhs/lib/wnres/Makefile.am	2007-06-05 10:41:42.000000000 +0200
@@ -1,3 +1,2 @@
 EXTRA_DIST = license.txt wn.xbm wnb.man wngloss.man
-wnresdir = $(prefix)/lib/wnres
-wnres_DATA = license.txt wn.xbm wnb.man wngloss.man
+pkgdata_DATA = license.txt wn.xbm wnb.man wngloss.man
diff -Naur --exclude '*~' --exclude '*.rej' --exclude '*.orig' WordNet-3.0/src/wnb WordNet-3.0.fhs/src/wnb
--- WordNet-3.0/src/wnb	2006-12-18 23:38:20.000000000 +0100
+++ WordNet-3.0.fhs/src/wnb	2007-06-05 11:15:28.000000000 +0200
@@ -103,7 +103,7 @@
 
 if {$tcl_platform(platform) == "unix"} {
    if {[lsearch -exact [array names env] WNHOME] == -1} {
-	set resourcedir "/usr/local/WordNet-3.0/lib/wnres"
+	set resourcedir "/usr/share/WordNet"
    } else {
 	set resourcedir "$env(WNHOME)/lib/wnres"
    }