diff -ur WashNGo-2.3.1/cgi/Makefile ../WashNGo-2.3.1/cgi/Makefile
--- WashNGo-2.3.1/cgi/Makefile	2005-03-14 02:48:52.000000000 +0100
+++ ../WashNGo-2.3.1/cgi/Makefile	2005-04-19 12:36:52.977858992 +0200
@@ -9,7 +9,7 @@
 include $(TOP)/mk/config.mk
 include $(TOP)/mk/common.mk
 
-HC_SPEC_FLAGS=	-package-name $(PACKAGE) -package text # -fglasgow-exts		# -cpp -package posix -package data
+HC_SPEC_FLAGS=	-package-name $(PACKAGE) -package text -package lang-1.0 # -fglasgow-exts		# -cpp -package posix -package data
 HCLOADFLAGS=
 HCINCLUDES=	-i$(PATH_TO_UTILITY):$(PATH_TO_WASHMAIL):$(PATH_TO_WASHHTML)
 #OPT=		-fvia-C -O2-for-C 
@@ -18,7 +18,7 @@
 
 HCFLAGS=	$(HCEXTRAFLAGS) $(OPT) $(HC_SPEC_FLAGS) $(HCINCLUDES)
 
-HS_FILES=	$(LIBSOURCES) GuaranteedCGI.hs
+HS_FILES=	$(LIBSOURCES)# GuaranteedCGI.hs
 
 TMPDIR=/tmp
 FULLNAME=$(PACKAGE)-$(VERSION)
diff -ur WashNGo-2.3.1/cgi/Submit98.hs ../WashNGo-2.3.1/cgi/Submit98.hs
--- WashNGo-2.3.1/cgi/Submit98.hs	2004-12-14 13:56:10.000000000 +0100
+++ ../WashNGo-2.3.1/cgi/Submit98.hs	2005-04-19 12:30:31.105912352 +0200
@@ -1,7 +1,7 @@
 -- © 2002 Peter Thiemann
 -- |Haskell98 version of the submission functions.
 module Submit98
-	( InputHandle, HasValue (value)
+	( InputHandle (..), HasValue (value)
 	, F0 (F0), F1 (F1), F2 (F2), F3 (F3), F4 (F4), F5 (F5), F6 (F6), F7 (F7), F8 (F8)
 	, FL (FL), FA (FA)
 	, deF0, deF1, deF2, deF3, deF4, deF5, deF6, deF7, deF8
diff -ur WashNGo-2.3.1/Utility/Makefile ../WashNGo-2.3.1/Utility/Makefile
--- WashNGo-2.3.1/Utility/Makefile	2005-03-14 02:48:52.000000000 +0100
+++ ../WashNGo-2.3.1/Utility/Makefile	2005-04-19 12:36:52.584918728 +0200
@@ -94,7 +94,7 @@
 # generic stuff
 
 HC_SPEC_FLAGS=  -package-name $(PACKAGE)
-HCINCLUDES=	-package text
+HCINCLUDES=	-package text -package lang-1.0
 HCLOADFLAGS=
 
 OPT=		-O2 -ffi
diff -ur WashNGo-2.3.1/WASH/HTMLMonad98.hs ../WashNGo-2.3.1/WASH/HTMLMonad98.hs
--- WashNGo-2.3.1/WASH/HTMLMonad98.hs	2004-08-06 16:33:04.000000000 +0200
+++ ../WashNGo-2.3.1/WASH/HTMLMonad98.hs	2005-04-19 12:30:31.109911744 +0200
@@ -1287,6 +1287,7 @@
 instance AdmitChildOBJECT HEAD
 
 instance AdmitChildBODY NOFRAMES
+instance AdmitChildBODY HTML
 
 instance AdmitChildP IFRAME
 instance AdmitChildH1 IFRAME
diff -ur WashNGo-2.3.1/WASH/Makefile ../WashNGo-2.3.1/WASH/Makefile
--- WashNGo-2.3.1/WASH/Makefile	2005-03-14 02:48:52.000000000 +0100
+++ ../WashNGo-2.3.1/WASH/Makefile	2005-04-19 12:36:52.696901704 +0200
@@ -85,7 +85,7 @@
 ######################################################################
 # generic stuff
 
-HC_SPEC_FLAGS=	-package-name $(PACKAGE) # -fglasgow-exts		# -cpp -package posix -package data
+HC_SPEC_FLAGS=	-package-name $(PACKAGE) -package lang-1.0 # -fglasgow-exts		# -cpp -package posix -package data
 HCINCLUDES=	-i$(PATH_TO_UTILITY)
 HCLOADFLAGS=
 
diff -ur WashNGo-2.3.1/washparser/hs/Makefile ../WashNGo-2.3.1/washparser/hs/Makefile
--- WashNGo-2.3.1/washparser/hs/Makefile	2005-03-14 02:48:52.000000000 +0100
+++ ../WashNGo-2.3.1/washparser/hs/Makefile	2005-04-19 12:36:52.452938792 +0200
@@ -9,7 +9,7 @@
 HCFLAGS=	$(OPT) $(HC_SPEC_FLAGS) $(HINCLUDES)
 
 HINCLUDES=	$(HCPACKAGEFLAGS)
-HCPACKAGEFLAGS=	-package text
+HCPACKAGEFLAGS=	-package text -package lang-1.0
 
 
 LINK.o=		$(HC) $(HCLOADFLAGS)