diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 9dcd803ee..462ce63e5 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -53,7 +53,6 @@ stage2_SOURCES = \
vg_demangle.c \
vg_errcontext.c \
vg_execontext.c \
- vg_from_ucode.c \
vg_hashtable.c \
vg_instrument.c \
vg_main.c \
@@ -72,7 +71,6 @@ stage2_SOURCES = \
vg_skiplist.c \
vg_symtypes.c \
vg_syscalls.c \
- vg_to_ucode.c \
vg_toolint.c \
vg_translate.c \
vg_transtab.c
diff --git a/coregrind/vg_from_ucode.c b/coregrind/vg_from_ucode.c
deleted file mode 100644
index 233bd7ced..000000000
--- a/coregrind/vg_from_ucode.c
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- The JITter: translate ucode back to x86 code. ---*/
-/*--- vg_from_ucode.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, an extensible x86 protected-mode
- emulator for monitoring program execution on x86-Unixes.
-
- Copyright (C) 2000-2004 Julian Seward
- jseward@acm.org
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-/*--------------------------------------------------------------------*/
-/*--- end vg_from_ucode.c ---*/
-/*--------------------------------------------------------------------*/
diff --git a/coregrind/vg_to_ucode.c b/coregrind/vg_to_ucode.c
deleted file mode 100644
index 2c0e98454..000000000
--- a/coregrind/vg_to_ucode.c
+++ /dev/null
@@ -1,34 +0,0 @@
-
-/*--------------------------------------------------------------------*/
-/*--- The JITter: translate x86 code to ucode. ---*/
-/*--- vg_to_ucode.c ---*/
-/*--------------------------------------------------------------------*/
-
-/*
- This file is part of Valgrind, an extensible x86 protected-mode
- emulator for monitoring program execution on x86-Unixes.
-
- Copyright (C) 2000-2004 Julian Seward
- jseward@acm.org
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307, USA.
-
- The GNU General Public License is contained in the file COPYING.
-*/
-
-/*--------------------------------------------------------------------*/
-/*--- end vg_to_ucode.c ---*/
-/*--------------------------------------------------------------------*/
diff --git a/memcheck/docs/mc_techdocs.html b/memcheck/docs/mc_techdocs.html
index 506856420..f6a7a625f 100644
--- a/memcheck/docs/mc_techdocs.html
+++ b/memcheck/docs/mc_techdocs.html
@@ -105,6 +105,9 @@ reader (vg_symtab2.c) are on the second rewrite. In a
sense, this document serves to record some of the knowledge gained as
a result.
+[Nb: the entire instrumentation/simulation part has again been rewritten,
+so as to be suitable for porting to architectures other than x86.]
+
Design overview