--- platforms/unix/config/configure.ac
+++ platforms/unix/config/configure.ac
@@ -38,7 +38,7 @@

 AC_INIT([config.h.in])

-AC_VM_VERSION(3,9,8, 3,9a,7024)
+AC_VM_VERSION(3,9,8, 3,9,7067)

 topdir=`cd ${srcdir}/../../..; pwd`
 cfgdir=`cd ${srcdir}; pwd`
@@ -80,8 +80,8 @@
 # libdir contains ${exec_prefix}, so we have to default and expand early
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-imgdir=`eval echo ${libdir}/squeak`
-plgdir=`eval echo ${imgdir}/${VM_VERSION}`
+imgdir=`eval echo ${datadir}/squeak`
+plgdir=`eval echo ${libdir}/squeak/${VM_VERSION}`

 AC_SUBST(imgdir)
 AC_SUBST(plgdir)
--- platforms/unix/config/make.cfg.in
+++ platforms/unix/config/make.cfg.in
@@ -71,7 +71,7 @@
 mandir=		@mandir@
 imgdir=		@imgdir@
 plgdir=		@plgdir@
-docdir=		$(prefix)/doc/squeak
+docdir=		@datadir@/doc/squeak

 SHELL=		@SHELL@
 MKINSTALLDIRS=	$(SHELL) $(cfgdir)/mkinstalldirs
--- platforms/unix/config/mkconfig.in.orig	2005-03-19 21:38:28.000000000 +0100
+++ platforms/unix/config/mkconfig.in	2006-09-18 22:14:52.000000000 +0200
@@ -2,8 +2,8 @@

 int_modules="@int_modules@"
 ext_modules="@ext_modules@"
-int_plugins="@int_plugins@ `tail -1 @vmmdir@/plugins.int | sed 's,.* =,,'`"
-ext_plugins="@ext_plugins@ `tail -1 @vmmdir@/plugins.ext | sed 's,.* =,,'`"
+int_plugins="@int_plugins@ `tail -n 1 @vmmdir@/plugins.int | sed 's,.* =,,'`"
+ext_plugins="@ext_plugins@ `tail -n 1 @vmmdir@/plugins.ext | sed 's,.* =,,'`"

 if test -f plugins.exc; then
   nlsp='tr \012\015 \040\040'
--- platforms/unix/config/verstamp.orig	2005-03-19 21:38:28.000000000 +0100
+++ platforms/unix/config/verstamp	2006-09-18 22:14:37.000000000 +0200
@@ -5,14 +5,14 @@
 # Last edited: 2002-06-08 18:32:53 by piumarta on emilia.inria.fr

 if test -f $1; then
-  SERIAL=`head -1 $1 | cut -d ' ' -f 3 | sed 's/;//'`
+  SERIAL=`head -n 1 $1 | cut -d ' ' -f 3 | sed 's/;//'`
   SERIAL=`expr $SERIAL + 1`
 else
   SERIAL=1
 fi

 if expr "$2" : ".*gcc" >/dev/null ; then
-  CC=`$2 -v 2>&1 | tail -1 | sed 's/.*based on//g' | awk '{print $1 , $3} '`
+  CC=`$2 -v 2>&1 | tail -n 1 | sed 's/.*based on//g' | awk '{print $1 , $3} '`
 else
   CC=$2
 fi
--- platforms/unix/config/Makefile.in.orig	2006-09-18 23:51:35.000000000 +0200
+++ platforms/unix/config/Makefile.in	2006-09-18 23:52:19.000000000 +0200
@@ -52,7 +52,7 @@
 # VM

 $(squeak) : config.sh $(SQLIBS) version.o
-	$(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
+	$(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs]
 	@echo
 	@size $(squeak)
 	@echo
@@ -123,7 +123,7 @@

 NPSqueak : config.sh $(SQLIBS) version.o $(NPOBJS)
 	gcc -bundle -flat_namespace -undefined suppress -o NPSqueak \
-	  $(NPLIBS) $(SQLIBS) version.o $(LIBS)  vm/vm.a
+	  $(NPLIBS) $(SQLIBS) version.o $(LIBS)

 # manual page

--- platforms/unix/vm-display-fbdev/Makefile.in.orig	2006-09-18 23:53:10.000000000 +0200
+++ platforms/unix/vm-display-fbdev/Makefile.in	2006-09-18 23:53:19.000000000 +0200
@@ -43,7 +43,7 @@
 TARGET		= vm-display-fbdev$a
 OBJS		= sqUnixFBDev$o

-XCFLAGS		= $(X_CFLAGS) -Wall -Werror
+XCFLAGS		= $(X_CFLAGS) -Wall

 XINCLUDES	= [includes] $(X_INCLUDES) \
 		  -I$(topdir)/platforms/Cross/plugins/FilePlugin \