diff --git a/src/util/emacs.el b/src/util/emacs.el
index 7fe45cb8d..5ea28e1bd 100644
--- a/src/util/emacs.el
+++ b/src/util/emacs.el
@@ -85,123 +85,159 @@
 		(set-buffer "emacs.el")
 		(concat (subseq (buffer-file-name (current-buffer)) 0 -13) x))
 	      '(
-"h/object.h"
+"h/bytecodes.h"
+"h/config.h.in"
+"h/cs.h"
+"h/ecl-cmp.h"
+"h/ecl-inl.h"
+"h/ecl.h"
 "h/eval.h"
 "h/external.h"
+"h/impl/math_dispatch.h"
+"h/impl/math_dispatch2.h"
+"h/impl/math_fenv.h"
+"h/impl/math_fenv_msvc.h"
+"h/internal.h"
+"h/number.h"
+"h/object.h"
+"h/page.h"
 "h/stacks.h"
-"c/character.d"
-"c/gfun.d"
-"c/num_comp.d"
-"c/string.d"
-"c/hash.d"
-"c/num_log.d"
-"c/structure.d"
-"c/num_pred.d"
-"c/symbol.d"
-"c/cmpaux.d"
-"c/instance.d"
-"c/num_rand.d"
+"h/unify.h"
 "c/all_symbols.d"
-"c/symbols_list.h"
-"c/num_sfun.d"
-"c/tcp.d"
 "c/alloc.d"
-"c/number.d"
-"c/time.d"
 "c/alloc_2.d"
-"c/dosdummy.d"
-"c/package.d"
 "c/apply.d"
-"c/dostimes.d"
-"c/list.d"
-"c/pathname.d"
+"c/arch/apply_x86.d"
+"c/arch/ffi_ppc32.d"
+"c/arch/ffi_x86.d"
+"c/arch/ffi_x86_64.d"
+"c/arch/fpe_none.c"
+"c/arch/fpe_x86.c"
 "c/array.d"
-"c/dpp.c"
-"c/load.d"
-"c/predicate.d"
-"c/typespec.d"
 "c/assignment.d"
-"c/earith.d"
-"c/print.d"
-;"c/unify.d"
 "c/backq.d"
-"c/error.d"
-"c/macros.d"
-"c/unixfsys.d"
 "c/big.d"
-"c/eval.d"
-"c/main.d"
-"c/unixint.d"
-"c/file.d"
-"c/mapfun.d"
-"c/read.d"
-"c/unixsys.d"
-"c/format.d"
-"c/reference.d"
-"c/num_arith.d"
-"c/sequence.d"
+"c/big_ll.d"
 "c/cfun.d"
-"c/gbc.d"
-"c/num_co.d"
-"c/stacks.d"
-"c/interpreter.d"
+"c/cfun_dispatch.d"
+"c/char_ctype.d"
+"c/character.d"
+"c/cinit.d"
+"c/cmpaux.d"
 "c/compiler.d"
 "c/disassembler.d"
-"c/multival.d"
-"c/threads.d"
+"c/dosdummy.d"
+"c/dostimes.d"
+"c/dpp.c"
+"c/earith.d"
+"c/ecl_constants.h"
+"c/ecl_features.h"
+"c/error.d"
+"c/eval.d"
+"c/ffi/backtrace.d"
+"c/ffi/cdata.d"
+"c/ffi/libraries.d"
+"c/ffi/mmap.d"
 "c/ffi.d"
-"lsp/arraylib.lsp"
-"lsp/assert.lsp"
-"lsp/autoload.lsp"
-"lsp/cmpinit.lsp"
-"lsp/cmuutil.lsp"
-"lsp/format.lsp"
-"lsp/defmacro.lsp"
-"lsp/defpackage.lsp"
-"lsp/defstruct.lsp"
-"lsp/describe.lsp"
-"lsp/evalmacros.lsp"
-"lsp/export.lsp"
-"lsp/helpfile.lsp"
-"lsp/iolib.lsp"
-"lsp/listlib.lsp"
-"lsp/loop.lsp"
-"lsp/loop2.lsp"
-"lsp/mislib.lsp"
-"lsp/module.lsp"
-"lsp/numlib.lsp"
-"lsp/packlib.lsp"
-"lsp/pprint.lsp"
-"lsp/predlib.lsp"
-"lsp/proclaim.lsp"
-"lsp/seq.lsp"
-"lsp/seqlib.lsp"
-"lsp/setf.lsp"
-"lsp/mp.lsp"
-"lsp/top.lsp"
-"lsp/trace.lsp"
-"lsp/util.lsp"
-"lsp/ffi.lsp"
-"clos/boot.lsp"
-"clos/builtin.lsp"
-"clos/change.lsp"
-"clos/cmpinit.lsp"
-"clos/combin.lsp"
-"clos/defclass.lsp"
-"clos/fixup.lsp"
-"clos/generic.lsp"
-"clos/init.lsp"
-"clos/inspect.lsp"
-"clos/kernel.lsp"
-"clos/macros.lsp"
-"clos/method.lsp"
-"clos/precomp.lsp"
-"clos/print.lsp"
-"clos/slot.lsp"
-"clos/standard.lsp"
-"clos/stdmethod.lsp"
-"clos/walk.lsp"
-"clos/conditions.lsp"
+"c/file.d"
+"c/format.d"
+"c/gbc-new.d"
+"c/gbc.d"
+"c/gfun.d"
+"c/hash.d"
+"c/instance.d"
+"c/interpreter.d"
+"c/iso_latin_names.h"
+"c/list.d"
+"c/load.d"
+"c/macros.d"
+"c/main.d"
+"c/Makefile.in"
+"c/mapfun.d"
+"c/multival.d"
+"c/newhash.h"
+"c/num_arith.d"
+"c/num_co.d"
+"c/num_log.d"
+"c/num_pred.d"
+"c/num_rand.d"
+"c/number.d"
+"c/numbers/abs.d"
+"c/numbers/atan.d"
+"c/numbers/conjugate.d"
+"c/numbers/cos.d"
+"c/numbers/cosh.d"
+"c/numbers/divide.d"
+"c/numbers/exp.d"
+"c/numbers/expt.d"
+"c/numbers/float_fix_compare.d"
+"c/numbers/log.d"
+"c/numbers/minmax.d"
+"c/numbers/minus.d"
+"c/numbers/minusp.d"
+"c/numbers/negate.d"
+"c/numbers/number_compare.d"
+"c/numbers/number_equalp.d"
+"c/numbers/one_minus.d"
+"c/numbers/one_plus.d"
+"c/numbers/plus.d"
+"c/numbers/plusp.d"
+"c/numbers/sin.d"
+"c/numbers/sinh.d"
+"c/numbers/sqrt.d"
+"c/numbers/tan.d"
+"c/numbers/tanh.d"
+"c/numbers/times.d"
+"c/numbers/zerop.d"
+"c/package.d"
+"c/pathname.d"
+"c/predicate.d"
+"c/print.d"
+"c/printer/float_string_old.d"
+"c/printer/float_to_digits.d"
+"c/printer/float_to_string.d"
+"c/printer/integer_to_string.d"
+"c/printer/print_unreadable.d"
+"c/printer/write_array.d"
+"c/printer/write_code.d"
+"c/printer/write_list.d"
+"c/printer/write_object.d"
+"c/printer/write_sse.d"
+"c/printer/write_symbol.d"
+"c/printer/write_ugly.d"
+"c/read.d"
+"c/reader/parse_integer.d"
+"c/reader/parse_number.d"
+"c/reader/read_codeblock.d"
+"c/reference.d"
+"c/sequence.d"
+"c/serialize/bits2lisp.d"
+"c/serialize/dispatch.c"
+"c/serialize/lisp2bits.d"
+"c/serialize/out_pool.c"
+"c/serialize/serialize.h"
+"c/serialize/serialize_array.c"
+"c/serialize.d"
+"c/sse2.d"
+"c/stacks.d"
+"c/string.d"
+"c/structure.d"
+"c/symbol.d"
+"c/symbols_list.h"
+"c/symbols_list2.h"
+"c/tcp.d"
+"c/threads/atomic.d"
+"c/threads/condition_variable.d"
+"c/threads/mutex.d"
+"c/threads/process.d"
+"c/threads/rwlock.d"
+"c/threads/semaphore.d"
+"c/time.d"
+"c/typespec.d"
+"c/unify.d"
+"c/unixfsys.d"
+"c/unixint.d"
+"c/unixsys.d"
 "cmp/cmparray.lsp"
 "cmp/cmpbind.lsp"
 "cmp/cmpblock.lsp"
@@ -243,6 +279,9 @@
 "cmp/cmpopt-sequence.lsp"
 "cmp/cmpopt-type.lsp"
 "cmp/cmpopt.lsp"
+"cmp/cmpos-features.lsp"
+"cmp/cmpos-run.lsp"
+"cmp/cmpos-run.lsp~"
 "cmp/cmppackage.lsp"
 "cmp/cmppolicy.lsp"
 "cmp/cmpprop.lsp"
@@ -260,10 +299,76 @@
 "cmp/cmputil.lsp"
 "cmp/cmpvar.lsp"
 "cmp/cmpwt.lsp"
+"cmp/defsys.lsp.in"
+"cmp/load.lsp.in"
 "cmp/proclamations.lsp"
 "cmp/sysfun.lsp"
 "cmp/test.lsp"
-)))
+"lsp/arraylib.lsp"
+"lsp/assert.lsp"
+"lsp/autoload.lsp"
+"lsp/cmdline.lsp"
+"lsp/cmpinit.lsp"
+"lsp/cmuutil.lsp"
+"lsp/config.lsp.in"
+"lsp/defmacro.lsp"
+"lsp/defpackage.lsp"
+"lsp/defstruct.lsp"
+"lsp/defsys.lsp.in"
+"lsp/describe.lsp"
+"lsp/evalmacros.lsp"
+"lsp/export.lsp"
+"lsp/ffi.lsp"
+"lsp/format.lsp"
+"lsp/helpfile.lsp"
+"lsp/init.lsp"
+"lsp/iolib.lsp"
+"lsp/listlib.lsp"
+"lsp/load.lsp.in"
+"lsp/loop.lsp"
+"lsp/loop2.lsp"
+"lsp/mislib.lsp"
+"lsp/module.lsp"
+"lsp/mp.lsp"
+"lsp/numlib.lsp"
+"lsp/packlib.lsp"
+"lsp/pprint.lsp"
+"lsp/predlib.lsp"
+"lsp/process.lsp"
+"lsp/proclaim.lsp"
+"lsp/seq.lsp"
+"lsp/seqlib.lsp"
+"lsp/seqmacros.lsp"
+"lsp/setf.lsp"
+"lsp/split-sequence.lisp"
+"lsp/top.lsp"
+"lsp/trace.lsp"
+"lsp/unicode.lsp"
+"lsp/util.lsp"
+"clos/boot.lsp"
+"clos/builtin.lsp"
+"clos/change.lsp"
+"clos/cmpinit.lsp"
+"clos/combin.lsp"
+"clos/conditions.lsp"
+"clos/defclass.lsp"
+"clos/defsys.lsp.in"
+"clos/fixup.lsp"
+"clos/generic.lsp"
+"clos/init.lsp"
+"clos/inspect.lsp"
+"clos/kernel.lsp"
+"clos/load.lsp.in"
+"clos/macros.lsp"
+"clos/method.lsp"
+"clos/precomp.lsp"
+"clos/print.lsp"
+"clos/slot.lsp"
+"clos/standard.lsp"
+"clos/stdmethod.lsp"
+"clos/streams.lsp"
+"clos/walk.lsp"
+                )))
 
 (mapcar 'find-file ecl-files)