diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index 402ac42954a..d73dab3bce8 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2007/11/25 14:56:09 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2008/08/20 20:36:45 espie Exp $
 
 COMMENT=		GPL computer algebra system based on DOE Macsyma
 
-VERSION=		5.13.0
+VERSION=		5.16.1
 DISTNAME=		maxima-${VERSION}
 CATEGORIES=		math
 
@@ -19,16 +19,16 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=maxima/}
 USE_GMAKE=		yes
 CONFIGURE_STYLE=	gnu
 
-RUN_DEPENDS=		:clisp->=2.42:lang/clisp 
-BUILD_DEPENDS=		${RUN_DEPENDS}
-WANTLIB +=		c m ncurses readline sigsegv
+RUN_DEPENDS=		::lang/ecl
+BUILD_DEPENDS=		::lang/ecl
+WANTLIB +=		c gc gmp m pthread
 
 SUBST_VARS=		VERSION
 
 FLAVORS=		no_x11
 FLAVOR?=
 
-CONFIGURE_ARGS+=	--enable-clisp 
+CONFIGURE_ARGS+=	--enable-ecl
 .if !${FLAVOR:L:Mno_x11}
 USE_X11=		Yes
 RUN_DEPENDS+= 		:tcl-8.4.*:lang/tcl/8.4 \
diff --git a/math/maxima/distinfo b/math/maxima/distinfo
index 0498a688121..f1e7b7e4020 100644
--- a/math/maxima/distinfo
+++ b/math/maxima/distinfo
@@ -1,5 +1,5 @@
-MD5 (maxima-5.13.0.tar.gz) = cxe6IvxIVVSxWs62vCJUKw==
-RMD160 (maxima-5.13.0.tar.gz) = LskWePjGpvhj1rpEjymXk+Usgio=
-SHA1 (maxima-5.13.0.tar.gz) = yqxTIm+iUaIrV3wvdtwXGRPnEyM=
-SHA256 (maxima-5.13.0.tar.gz) = liXgl4X4j3OPr0CtZIiazRcyjgQ8Oe9a1W8xctdq8Yc=
-SIZE (maxima-5.13.0.tar.gz) = 19216173
+MD5 (maxima-5.16.1.tar.gz) = X1pu6AFUowPIe0qbEAS9QA==
+RMD160 (maxima-5.16.1.tar.gz) = lodIT3/2n2QASJaj+TsUtiQkmks=
+SHA1 (maxima-5.16.1.tar.gz) = WRewAjKTppKI5dLDBd+gkf4vBdk=
+SHA256 (maxima-5.16.1.tar.gz) = fGOPw4O15vq6sf/ZShxcNQHAwdX7Osgg9w+0dOV/mQU=
+SIZE (maxima-5.16.1.tar.gz) = 19932719
diff --git a/math/maxima/patches/patch-maxima_spec_in b/math/maxima/patches/patch-maxima_spec_in
new file mode 100644
index 00000000000..d97095ccc80
--- /dev/null
+++ b/math/maxima/patches/patch-maxima_spec_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-maxima_spec_in,v 1.1 2008/08/20 20:36:45 espie Exp $
+--- maxima.spec.in.orig	Fri Aug 15 18:28:30 2008
++++ maxima.spec.in	Fri Aug 15 18:28:40 2008
+@@ -33,7 +33,7 @@
+ 
+ # Inhibit automatic compressing of info files. Compressed info
+ # files break maxima's internal help.
+-%define __spec_install_post /bin/true
++%define __spec_install_post /usr/bin/true
+ 
+ Summary: Symbolic Computation Program
+ Name: maxima
diff --git a/math/maxima/patches/patch-src_Makefile_am b/math/maxima/patches/patch-src_Makefile_am
new file mode 100644
index 00000000000..a51bff9612a
--- /dev/null
+++ b/math/maxima/patches/patch-src_Makefile_am
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_am,v 1.1 2008/08/20 20:36:45 espie Exp $
+--- src/Makefile.am.orig	Fri Aug 15 18:28:45 2008
++++ src/Makefile.am	Fri Aug 15 18:29:02 2008
+@@ -284,7 +284,7 @@ binary-ecl/maxima:
+ 	mv maxima binary-ecl/maxima || \
+ 	success=false; \
+ 	test -f maxima-tmp && mv maxima-tmp maxima ; \
+-	test $$success = true && /bin/true || /bin/false
++	test $$success = true && /usr/bin/true || /usr/bin/false
+ 
+ install-ecl:
+ 	$(mkinstalldirs) "$(DESTDIR)$(verpkglibdir)/binary-ecl"
diff --git a/math/maxima/patches/patch-src_Makefile_in b/math/maxima/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..6f7e63d5352
--- /dev/null
+++ b/math/maxima/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2008/08/20 20:36:45 espie Exp $
+--- src/Makefile.in.orig	Fri Aug 15 18:29:04 2008
++++ src/Makefile.in	Fri Aug 15 18:29:46 2008
+@@ -2965,7 +2965,7 @@ uninstall-datafiles:
+ @ECL_TRUE@	mv maxima binary-ecl/maxima || \
+ @ECL_TRUE@	success=false; \
+ @ECL_TRUE@	test -f maxima-tmp && mv maxima-tmp maxima ; \
+-@ECL_TRUE@	test $$success = true && /bin/true || /bin/false
++@ECL_TRUE@	test $$success = true && /usr/bin/true || /usr/bin/false
+ 
+ @ECL_TRUE@install-ecl:
+ @ECL_TRUE@	$(mkinstalldirs) "$(DESTDIR)$(verpkglibdir)/binary-ecl"
diff --git a/math/maxima/pkg/PLIST b/math/maxima/pkg/PLIST
index dd4f5d13851..e1573a391e6 100644
--- a/math/maxima/pkg/PLIST
+++ b/math/maxima/pkg/PLIST
@@ -1,15 +1,15 @@
-@comment $OpenBSD: PLIST,v 1.3 2007/11/25 14:56:09 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2008/08/20 20:36:45 espie Exp $
 bin/maxima
 bin/rmaxima
 bin/xmaxima
+info/imaxima.info
 info/maxima-index.lisp
 @info info/maxima.info
 @info info/xmaxima.info
 lib/maxima/
 lib/maxima/${VERSION}/
-lib/maxima/${VERSION}/binary-clisp/
-lib/maxima/${VERSION}/binary-clisp/lisp.run
-lib/maxima/${VERSION}/binary-clisp/maxima.mem
+lib/maxima/${VERSION}/binary-ecl/
+@bin lib/maxima/${VERSION}/binary-ecl/maxima
 libexec/maxima/
 libexec/maxima/${VERSION}/
 libexec/maxima/${VERSION}/mgnuplot
@@ -49,6 +49,21 @@ share/maxima/${VERSION}/doc/html/figures/dynamics6.gif
 share/maxima/${VERSION}/doc/html/figures/dynamics7.gif
 share/maxima/${VERSION}/doc/html/figures/dynamics8.gif
 share/maxima/${VERSION}/doc/html/figures/dynamics9.gif
+share/maxima/${VERSION}/doc/html/figures/graphs01.gif
+share/maxima/${VERSION}/doc/html/figures/graphs02.gif
+share/maxima/${VERSION}/doc/html/figures/graphs03.gif
+share/maxima/${VERSION}/doc/html/figures/graphs04.gif
+share/maxima/${VERSION}/doc/html/figures/graphs05.gif
+share/maxima/${VERSION}/doc/html/figures/graphs06.gif
+share/maxima/${VERSION}/doc/html/figures/graphs07.gif
+share/maxima/${VERSION}/doc/html/figures/graphs08.gif
+share/maxima/${VERSION}/doc/html/figures/graphs09.gif
+share/maxima/${VERSION}/doc/html/figures/graphs10.gif
+share/maxima/${VERSION}/doc/html/figures/graphs11.gif
+share/maxima/${VERSION}/doc/html/figures/graphs12.gif
+share/maxima/${VERSION}/doc/html/figures/graphs13.gif
+share/maxima/${VERSION}/doc/html/figures/graphs14.gif
+share/maxima/${VERSION}/doc/html/figures/graphs15.gif
 share/maxima/${VERSION}/doc/html/figures/implicit_plot.gif
 share/maxima/${VERSION}/doc/html/figures/orthopoly1.gif
 share/maxima/${VERSION}/doc/html/figures/plotdf1.gif
@@ -174,7 +189,12 @@ share/maxima/${VERSION}/doc/html/maxima_85.html
 share/maxima/${VERSION}/doc/html/maxima_86.html
 share/maxima/${VERSION}/doc/html/maxima_87.html
 share/maxima/${VERSION}/doc/html/maxima_88.html
+share/maxima/${VERSION}/doc/html/maxima_89.html
 share/maxima/${VERSION}/doc/html/maxima_9.html
+share/maxima/${VERSION}/doc/html/maxima_90.html
+share/maxima/${VERSION}/doc/html/maxima_91.html
+share/maxima/${VERSION}/doc/html/maxima_92.html
+share/maxima/${VERSION}/doc/html/maxima_93.html
 share/maxima/${VERSION}/doc/html/maxima_abt.html
 share/maxima/${VERSION}/doc/html/maxima_fot.html
 share/maxima/${VERSION}/doc/html/maxima_ovr.html
@@ -205,6 +225,10 @@ share/maxima/${VERSION}/emacs/dbl.el
 share/maxima/${VERSION}/emacs/emaxima.el
 share/maxima/${VERSION}/emacs/emaxima.lisp
 share/maxima/${VERSION}/emacs/emaxima.sty
+share/maxima/${VERSION}/emacs/imath.el
+share/maxima/${VERSION}/emacs/imaxima-autoconf-variables.el
+share/maxima/${VERSION}/emacs/imaxima.el
+share/maxima/${VERSION}/emacs/imaxima.lisp
 share/maxima/${VERSION}/emacs/maxima-font-lock.el
 share/maxima/${VERSION}/emacs/maxima.el
 share/maxima/${VERSION}/emacs/smart-complete.el
@@ -254,7 +278,6 @@ share/maxima/${VERSION}/share/algebra/gcdex.mac
 share/maxima/${VERSION}/share/algebra/grob1.lisp
 share/maxima/${VERSION}/share/algebra/nusum.mac
 share/maxima/${VERSION}/share/algebra/recur.dem
-share/maxima/${VERSION}/share/algebra/recur.lisp
 share/maxima/${VERSION}/share/algebra/recur.mac
 share/maxima/${VERSION}/share/algebra/recur.transcript
 share/maxima/${VERSION}/share/algebra/solver/
@@ -325,13 +348,24 @@ share/maxima/${VERSION}/share/contrib/Zeilberger/zb_prover.mac
 share/maxima/${VERSION}/share/contrib/Zeilberger/zeilberger.mac
 share/maxima/${VERSION}/share/contrib/Zeilberger/zeilberger_algorithm.mac
 share/maxima/${VERSION}/share/contrib/Zeilberger/zeilberger_linear_algebra.mac
+share/maxima/${VERSION}/share/contrib/amatrix/
+share/maxima/${VERSION}/share/contrib/amatrix/README
+share/maxima/${VERSION}/share/contrib/amatrix/amatrix.dem
+share/maxima/${VERSION}/share/contrib/amatrix/amatrix.lisp
+share/maxima/${VERSION}/share/contrib/amatrix/amatrix.mac
+share/maxima/${VERSION}/share/contrib/amatrix/rtest_amatrix.mac
+share/maxima/${VERSION}/share/contrib/amatrix/rtest_wilcoxon.mac
+share/maxima/${VERSION}/share/contrib/amatrix/wilcoxon.mac
 share/maxima/${VERSION}/share/contrib/augmented_lagrangian.mac
+share/maxima/${VERSION}/share/contrib/bitwise/
+share/maxima/${VERSION}/share/contrib/bitwise/bitwise.lisp
+share/maxima/${VERSION}/share/contrib/bitwise/bitwise_specification.txt
+share/maxima/${VERSION}/share/contrib/bitwise/rtest_bitwise.mac
 share/maxima/${VERSION}/share/contrib/bode.mac
 share/maxima/${VERSION}/share/contrib/boolsimp/
 share/maxima/${VERSION}/share/contrib/boolsimp/boolsimp.lisp
 share/maxima/${VERSION}/share/contrib/boolsimp/rtest_boolsimp.mac
 share/maxima/${VERSION}/share/contrib/clebsch_gordan.mac
-share/maxima/${VERSION}/share/contrib/defstruct.lisp
 share/maxima/${VERSION}/share/contrib/descriptive/
 share/maxima/${VERSION}/share/contrib/descriptive/biomed.data
 share/maxima/${VERSION}/share/contrib/descriptive/descriptive.mac
@@ -392,9 +426,12 @@ share/maxima/${VERSION}/share/contrib/diffequations/tests/testsuite.lisp
 share/maxima/${VERSION}/share/contrib/distrib/
 share/maxima/${VERSION}/share/contrib/distrib/distrib.mac
 share/maxima/${VERSION}/share/contrib/distrib/numdistrib.lisp
-share/maxima/${VERSION}/share/contrib/eval_string.lisp
+share/maxima/${VERSION}/share/contrib/distrib/rtest_distrib.mac
 share/maxima/${VERSION}/share/contrib/ezunits/
+share/maxima/${VERSION}/share/contrib/ezunits/ezunits.dem
+share/maxima/${VERSION}/share/contrib/ezunits/ezunits.lisp
 share/maxima/${VERSION}/share/contrib/ezunits/ezunits.mac
+share/maxima/${VERSION}/share/contrib/ezunits/physical_constants.mac
 share/maxima/${VERSION}/share/contrib/ezunits/rtestezunits.mac
 share/maxima/${VERSION}/share/contrib/f90.lisp
 share/maxima/${VERSION}/share/contrib/floatproperties.lisp
@@ -412,10 +449,30 @@ share/maxima/${VERSION}/share/contrib/format/format.mac
 share/maxima/${VERSION}/share/contrib/format/format.ps
 share/maxima/${VERSION}/share/contrib/format/pois2.demo
 share/maxima/${VERSION}/share/contrib/format/pois2m.ps
+share/maxima/${VERSION}/share/contrib/fourier_elim/
+share/maxima/${VERSION}/share/contrib/fourier_elim/fourier_elim.lisp
+share/maxima/${VERSION}/share/contrib/fourier_elim/rtest_fourier_elim.mac
 share/maxima/${VERSION}/share/contrib/fractals/
 share/maxima/${VERSION}/share/contrib/fractals/fractals.mac
 share/maxima/${VERSION}/share/contrib/fractals/fractals.texi
 share/maxima/${VERSION}/share/contrib/fractals/rtest_fractals.mac
+share/maxima/${VERSION}/share/contrib/fresnel/
+share/maxima/${VERSION}/share/contrib/fresnel/d78.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fg.mac
+share/maxima/${VERSION}/share/contrib/fresnel/filter.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnel.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnel1.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnelCStaylor.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnelFG.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnelFGArrays.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnelFGTable.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnel_linear_values.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnel_linear_values1.mac
+share/maxima/${VERSION}/share/contrib/fresnel/fresnelstudy.mac
+share/maxima/${VERSION}/share/contrib/fresnel/ft1.mac
+share/maxima/${VERSION}/share/contrib/fresnel/randi.mac
+share/maxima/${VERSION}/share/contrib/fresnel/randil.mac
+share/maxima/${VERSION}/share/contrib/fresnel/readme.txt
 share/maxima/${VERSION}/share/contrib/gentran/
 share/maxima/${VERSION}/share/contrib/gentran/Makefile
 share/maxima/${VERSION}/share/contrib/gentran/convmac.lisp
@@ -480,17 +537,35 @@ share/maxima/${VERSION}/share/contrib/gentran/test/type.mac
 share/maxima/${VERSION}/share/contrib/gentran/test/type.output
 share/maxima/${VERSION}/share/contrib/gentran/vaxinit.lisp
 share/maxima/${VERSION}/share/contrib/gentran/vaxlsp.lisp
+share/maxima/${VERSION}/share/contrib/gf/
+share/maxima/${VERSION}/share/contrib/gf/gf.mac
+share/maxima/${VERSION}/share/contrib/gf/gf_hard_test.mac
+share/maxima/${VERSION}/share/contrib/gf/gf_manual.pdf
+share/maxima/${VERSION}/share/contrib/gf/gf_manual.tex
+share/maxima/${VERSION}/share/contrib/gf/gf_test.mac
+share/maxima/${VERSION}/share/contrib/gf/whatsnew.txt
 share/maxima/${VERSION}/share/contrib/ggf.mac
 share/maxima/${VERSION}/share/contrib/graph2d.lisp
 share/maxima/${VERSION}/share/contrib/graphs/
+share/maxima/${VERSION}/share/contrib/graphs/cgraphs.mac
+share/maxima/${VERSION}/share/contrib/graphs/connectivity.mac
 share/maxima/${VERSION}/share/contrib/graphs/create_graph.mac
+share/maxima/${VERSION}/share/contrib/graphs/demoucron.lisp
+share/maxima/${VERSION}/share/contrib/graphs/dijkstra.lisp
 share/maxima/${VERSION}/share/contrib/graphs/draw_graph.mac
+share/maxima/${VERSION}/share/contrib/graphs/graph6.lisp
 share/maxima/${VERSION}/share/contrib/graphs/graph_core.lisp
 share/maxima/${VERSION}/share/contrib/graphs/graph_polynomials.mac
+share/maxima/${VERSION}/share/contrib/graphs/graphio.mac
 share/maxima/${VERSION}/share/contrib/graphs/graphs.mac
-share/maxima/${VERSION}/share/contrib/graphs/graphs_documentation.pdf
+share/maxima/${VERSION}/share/contrib/graphs/graphs.system
+share/maxima/${VERSION}/share/contrib/graphs/isomorphism.lisp
+share/maxima/${VERSION}/share/contrib/graphs/load-graphs.lisp
+share/maxima/${VERSION}/share/contrib/graphs/matching.lisp
+share/maxima/${VERSION}/share/contrib/graphs/spring_embedding.lisp
 share/maxima/${VERSION}/share/contrib/impdiff.mac
 share/maxima/${VERSION}/share/contrib/implicit_plot.lisp
+share/maxima/${VERSION}/share/contrib/integer_sequence.lisp
 share/maxima/${VERSION}/share/contrib/levin/
 share/maxima/${VERSION}/share/contrib/levin/levin.dem
 share/maxima/${VERSION}/share/contrib/levin/levin.mac
@@ -509,19 +584,28 @@ share/maxima/${VERSION}/share/contrib/maxima-server.lisp
 share/maxima/${VERSION}/share/contrib/maximaMathML/
 share/maxima/${VERSION}/share/contrib/maximaMathML/CtMathML.lisp
 share/maxima/${VERSION}/share/contrib/maximaMathML/PrMathML.lisp
-share/maxima/${VERSION}/share/contrib/maximaMathML/load-mathml.lisp
 share/maxima/${VERSION}/share/contrib/maximaMathML/mathml-maxima.lisp
 share/maxima/${VERSION}/share/contrib/maximaMathML/mathml.readme
 share/maxima/${VERSION}/share/contrib/maximaMathML/mathmldisplay.lisp
+share/maxima/${VERSION}/share/contrib/maximaMathML/maximaMathML.lisp
 share/maxima/${VERSION}/share/contrib/mcclim/
 share/maxima/${VERSION}/share/contrib/mcclim/README
 share/maxima/${VERSION}/share/contrib/mcclim/formula.lisp
 share/maxima/${VERSION}/share/contrib/mcclim/listeneroutput.png
 share/maxima/${VERSION}/share/contrib/mcclim/maxima-repl-mcclim.lisp
 share/maxima/${VERSION}/share/contrib/mcclim/postscriptoutput.png
+share/maxima/${VERSION}/share/contrib/meijer_g.tex
 share/maxima/${VERSION}/share/contrib/meijer_gv2.mac
 share/maxima/${VERSION}/share/contrib/mnewton.mac
 share/maxima/${VERSION}/share/contrib/multiadditive.lisp
+share/maxima/${VERSION}/share/contrib/namespaces/
+share/maxima/${VERSION}/share/contrib/namespaces/foo.mac
+share/maxima/${VERSION}/share/contrib/namespaces/namespaces.lisp
+share/maxima/${VERSION}/share/contrib/namespaces/rtest_namespaces.mac
+share/maxima/${VERSION}/share/contrib/noninteractive/
+share/maxima/${VERSION}/share/contrib/noninteractive/asksign1.lisp
+share/maxima/${VERSION}/share/contrib/noninteractive/noninteractive.lisp
+share/maxima/${VERSION}/share/contrib/noninteractive/noninteractive.mac
 share/maxima/${VERSION}/share/contrib/nset/
 share/maxima/${VERSION}/share/contrib/nset/README
 share/maxima/${VERSION}/share/contrib/nset/announce-1.2.txt
@@ -529,7 +613,9 @@ share/maxima/${VERSION}/share/contrib/nset/changes_1.0_to_1.2.txt
 share/maxima/${VERSION}/share/contrib/numericalio/
 share/maxima/${VERSION}/share/contrib/numericalio/README
 share/maxima/${VERSION}/share/contrib/numericalio/array.data
+share/maxima/${VERSION}/share/contrib/numericalio/encode-decode-float.lisp
 share/maxima/${VERSION}/share/contrib/numericalio/numericalio.lisp
+share/maxima/${VERSION}/share/contrib/numericalio/numericalio.mac
 share/maxima/${VERSION}/share/contrib/numericalio/pipe.data
 share/maxima/${VERSION}/share/contrib/numericalio/ragged.data
 share/maxima/${VERSION}/share/contrib/numericalio/really-csv.data
@@ -538,6 +624,8 @@ share/maxima/${VERSION}/share/contrib/numericalio/rectangular.csv
 share/maxima/${VERSION}/share/contrib/numericalio/rectangular.data
 share/maxima/${VERSION}/share/contrib/numericalio/rtest_numericalio.mac
 share/maxima/${VERSION}/share/contrib/numericalio/semicolon.data
+share/maxima/${VERSION}/share/contrib/numericalio/test-binary.f8-lsb
+share/maxima/${VERSION}/share/contrib/numericalio/test-binary.f8-msb
 share/maxima/${VERSION}/share/contrib/opsubst.lisp
 share/maxima/${VERSION}/share/contrib/pdiff/
 share/maxima/${VERSION}/share/contrib/pdiff/battex.sty
@@ -545,6 +633,7 @@ share/maxima/${VERSION}/share/contrib/pdiff/history.txt
 share/maxima/${VERSION}/share/contrib/pdiff/pdiff-doc.pdf
 share/maxima/${VERSION}/share/contrib/pdiff/pdiff-doc.tex
 share/maxima/${VERSION}/share/contrib/pdiff/pdiff.lisp
+share/maxima/${VERSION}/share/contrib/pdiff/rtest_pdiff.mac
 share/maxima/${VERSION}/share/contrib/plsquares.mac
 share/maxima/${VERSION}/share/contrib/powers.lisp
 share/maxima/${VERSION}/share/contrib/prim/
@@ -609,6 +698,8 @@ share/maxima/${VERSION}/share/contrib/rand/vandpol.mac
 share/maxima/${VERSION}/share/contrib/rand/vandpol.usg
 share/maxima/${VERSION}/share/contrib/rtest_lsquares.mac
 share/maxima/${VERSION}/share/contrib/rtest_opproperties.mac
+share/maxima/${VERSION}/share/contrib/rtest_sequence.mac
+share/maxima/${VERSION}/share/contrib/rtest_topoly.mac
 share/maxima/${VERSION}/share/contrib/rtestdefstruct.mac
 share/maxima/${VERSION}/share/contrib/sarag/
 share/maxima/${VERSION}/share/contrib/sarag/aliases.mac
@@ -652,8 +743,10 @@ share/maxima/${VERSION}/share/contrib/simplex/Tests/share2b_c.csv
 share/maxima/${VERSION}/share/contrib/simplex/minimize_sx.mac
 share/maxima/${VERSION}/share/contrib/simplex/simplex.mac
 share/maxima/${VERSION}/share/contrib/simplex/simplex_algorithm.lisp
+share/maxima/${VERSION}/share/contrib/solve_rat_ineq.mac
 share/maxima/${VERSION}/share/contrib/solve_rec/
 share/maxima/${VERSION}/share/contrib/solve_rec/rtest_simplify_sum.mac
+share/maxima/${VERSION}/share/contrib/solve_rec/rtest_solve_rec.mac
 share/maxima/${VERSION}/share/contrib/solve_rec/simplify_sum.mac
 share/maxima/${VERSION}/share/contrib/solve_rec/simplify_sum_test.mac
 share/maxima/${VERSION}/share/contrib/solve_rec/solve_rec.dem
@@ -675,15 +768,22 @@ share/maxima/${VERSION}/share/contrib/stats/rtest_stats.mac
 share/maxima/${VERSION}/share/contrib/stats/stats.mac
 share/maxima/${VERSION}/share/contrib/stirling.mac
 share/maxima/${VERSION}/share/contrib/stringproc/
+share/maxima/${VERSION}/share/contrib/stringproc/eval_string.lisp
+share/maxima/${VERSION}/share/contrib/stringproc/pregexp.lisp
+share/maxima/${VERSION}/share/contrib/stringproc/printf.lisp
+share/maxima/${VERSION}/share/contrib/stringproc/rtestprintf.mac
 share/maxima/${VERSION}/share/contrib/stringproc/rteststringproc.mac
+share/maxima/${VERSION}/share/contrib/stringproc/sregex.lisp
 share/maxima/${VERSION}/share/contrib/stringproc/stringproc.lisp
 share/maxima/${VERSION}/share/contrib/stringproc/stringproc.mac
 share/maxima/${VERSION}/share/contrib/tex2ooo.lisp
 share/maxima/${VERSION}/share/contrib/tocl.lisp
 share/maxima/${VERSION}/share/contrib/topoly.lisp
+share/maxima/${VERSION}/share/contrib/topoly_solver.mac
 share/maxima/${VERSION}/share/contrib/unit/
 share/maxima/${VERSION}/share/contrib/unit/unit-functions.lisp
 share/maxima/${VERSION}/share/contrib/unit/unit.mac
+share/maxima/${VERSION}/share/contrib/unwind_protect.lisp
 share/maxima/${VERSION}/share/contrib/vector3d/
 share/maxima/${VERSION}/share/contrib/vector3d/vector3d.dem
 share/maxima/${VERSION}/share/contrib/vector3d/vector3d.mac
@@ -717,6 +817,7 @@ share/maxima/${VERSION}/share/diffequations/pivtr.mac
 share/maxima/${VERSION}/share/diffequations/pmain.mac
 share/maxima/${VERSION}/share/draw/
 share/maxima/${VERSION}/share/draw/draw.lisp
+share/maxima/${VERSION}/share/draw/implicit3d.lisp
 share/maxima/${VERSION}/share/draw/picture.lisp
 share/maxima/${VERSION}/share/draw/wbd.lisp
 share/maxima/${VERSION}/share/draw/worldmap.mac
@@ -966,6 +1067,7 @@ share/maxima/${VERSION}/share/matrix/pfaff.dem
 share/maxima/${VERSION}/share/matrix/pfaff.mac
 share/maxima/${VERSION}/share/matrix/pfaff.usg
 share/maxima/${VERSION}/share/matrix/rateig.mac
+share/maxima/${VERSION}/share/matrix/rtest_eigen.mac
 share/maxima/${VERSION}/share/maxima-init.lisp
 share/maxima/${VERSION}/share/misc/
 share/maxima/${VERSION}/share/misc/arrfun.mac
@@ -1009,6 +1111,7 @@ share/maxima/${VERSION}/share/numeric/newton.mac
 share/maxima/${VERSION}/share/numeric/newton1.mac
 share/maxima/${VERSION}/share/numeric/riemsum.mac
 share/maxima/${VERSION}/share/numeric/romberg.lisp
+share/maxima/${VERSION}/share/numeric/rtest_romberg.mac
 share/maxima/${VERSION}/share/numeric/simpsn.dem
 share/maxima/${VERSION}/share/numeric/simpsn.mac
 share/maxima/${VERSION}/share/numeric/submac.dem
@@ -1017,7 +1120,6 @@ share/maxima/${VERSION}/share/orthopoly/
 share/maxima/${VERSION}/share/orthopoly/README
 share/maxima/${VERSION}/share/orthopoly/changes_0.9_to_0.94.txt
 share/maxima/${VERSION}/share/orthopoly/h_atom.dem
-share/maxima/${VERSION}/share/orthopoly/orthopoly-init.lisp
 share/maxima/${VERSION}/share/orthopoly/orthopoly.lisp
 share/maxima/${VERSION}/share/orthopoly/test_orthopoly.mac
 share/maxima/${VERSION}/share/orthopoly/variational_method.dem
@@ -1104,6 +1206,7 @@ share/maxima/${VERSION}/share/tensor/allnutt.dem
 share/maxima/${VERSION}/share/tensor/atensor.dem
 share/maxima/${VERSION}/share/tensor/atensor.mac
 share/maxima/${VERSION}/share/tensor/bianchi.dem
+share/maxima/${VERSION}/share/tensor/bradic.dem
 share/maxima/${VERSION}/share/tensor/canten.lisp
 share/maxima/${VERSION}/share/tensor/car_iden.dem
 share/maxima/${VERSION}/share/tensor/ctensor.mac
@@ -1115,8 +1218,10 @@ share/maxima/${VERSION}/share/tensor/ctensor5.dem
 share/maxima/${VERSION}/share/tensor/ctensor6.dem
 share/maxima/${VERSION}/share/tensor/ctensor7.dem
 share/maxima/${VERSION}/share/tensor/ctensor8.dem
+share/maxima/${VERSION}/share/tensor/einhil.dem
 share/maxima/${VERSION}/share/tensor/ex_calc.dem
 share/maxima/${VERSION}/share/tensor/ex_calc.mac
+share/maxima/${VERSION}/share/tensor/friedmann.dem
 share/maxima/${VERSION}/share/tensor/gener.lisp
 share/maxima/${VERSION}/share/tensor/godel.dem
 share/maxima/${VERSION}/share/tensor/helicity.dem
@@ -1135,10 +1240,14 @@ share/maxima/${VERSION}/share/tensor/kaluza.dem
 share/maxima/${VERSION}/share/tensor/lckdt.mac
 share/maxima/${VERSION}/share/tensor/mail-archive.txt
 share/maxima/${VERSION}/share/tensor/maxwell.dem
+share/maxima/${VERSION}/share/tensor/papapetrou.dem
 share/maxima/${VERSION}/share/tensor/petrov.dem
 share/maxima/${VERSION}/share/tensor/plasma.dem
 share/maxima/${VERSION}/share/tensor/rainich.dem
 share/maxima/${VERSION}/share/tensor/reissner.dem
+share/maxima/${VERSION}/share/tensor/rtest_atensor.mac
+share/maxima/${VERSION}/share/tensor/rtest_ctensor.mac
+share/maxima/${VERSION}/share/tensor/rtest_itensor.mac
 share/maxima/${VERSION}/share/tensor/schwarz.dem
 share/maxima/${VERSION}/share/tensor/spinor.dem
 share/maxima/${VERSION}/share/tensor/symtry.lisp
@@ -1146,12 +1255,6 @@ share/maxima/${VERSION}/share/tensor/taubnut.dem
 share/maxima/${VERSION}/share/tensor/tendemo.mac
 share/maxima/${VERSION}/share/tensor/tensor.dem
 share/maxima/${VERSION}/share/tensor/tentex.lisp
-share/maxima/${VERSION}/share/tensor/tests/
-share/maxima/${VERSION}/share/tensor/tests/atest.mac
-share/maxima/${VERSION}/share/tensor/tests/ctest.mac
-share/maxima/${VERSION}/share/tensor/tests/do_tests.mac
-share/maxima/${VERSION}/share/tensor/tests/itest.mac
-share/maxima/${VERSION}/share/tensor/tests/testsuite.lisp
 share/maxima/${VERSION}/share/tensor/tetrad.dem
 share/maxima/${VERSION}/share/tensor/weyl.dem
 share/maxima/${VERSION}/share/trigonometry/
@@ -1206,9 +1309,11 @@ share/maxima/${VERSION}/src/desoln.lisp
 share/maxima/${VERSION}/src/displa.lisp
 share/maxima/${VERSION}/src/displm.lisp
 share/maxima/${VERSION}/src/dskfn.lisp
+share/maxima/${VERSION}/src/ecl-port.lisp
 share/maxima/${VERSION}/src/elim.lisp
 share/maxima/${VERSION}/src/ellipt.lisp
 share/maxima/${VERSION}/src/evalw.lisp
+share/maxima/${VERSION}/src/expintegral.lisp
 share/maxima/${VERSION}/src/ezgcd.lisp
 share/maxima/${VERSION}/src/factor.lisp
 share/maxima/${VERSION}/src/fcall.lisp
@@ -1273,7 +1378,6 @@ share/maxima/${VERSION}/src/nparse.lisp
 share/maxima/${VERSION}/src/nrat4.lisp
 share/maxima/${VERSION}/src/nregex.lisp
 share/maxima/${VERSION}/src/nset.lisp
-share/maxima/${VERSION}/src/numer.lisp
 share/maxima/${VERSION}/src/numerical/
 share/maxima/${VERSION}/src/numerical/f2cl-lib.lisp
 share/maxima/${VERSION}/src/numerical/f2cl-package.lisp
@@ -1403,7 +1507,6 @@ share/maxima/${VERSION}/src/numerical/slatec/zunk1.lisp
 share/maxima/${VERSION}/src/numerical/slatec/zunk2.lisp
 share/maxima/${VERSION}/src/numerical/slatec/zuoik.lisp
 share/maxima/${VERSION}/src/numerical/slatec/zwrsk.lisp
-share/maxima/${VERSION}/src/numerm.lisp
 share/maxima/${VERSION}/src/nummod.lisp
 share/maxima/${VERSION}/src/numth.lisp
 share/maxima/${VERSION}/src/openmath.lisp
@@ -1503,12 +1606,14 @@ share/maxima/${VERSION}/tests/rtest8.mac
 share/maxima/${VERSION}/tests/rtest9.mac
 share/maxima/${VERSION}/tests/rtest9a.mac
 share/maxima/${VERSION}/tests/rtest_abs.mac
+share/maxima/${VERSION}/tests/rtest_algebraic.mac
 share/maxima/${VERSION}/tests/rtest_allnummod.mac
 share/maxima/${VERSION}/tests/rtest_boolean.mac
 share/maxima/${VERSION}/tests/rtest_diff_invtrig.mac
 share/maxima/${VERSION}/tests/rtest_dot.mac
 share/maxima/${VERSION}/tests/rtest_equal.mac
 share/maxima/${VERSION}/tests/rtest_everysome.mac
+share/maxima/${VERSION}/tests/rtest_hypgeo.mac
 share/maxima/${VERSION}/tests/rtest_map.mac
 share/maxima/${VERSION}/tests/rtest_mset.mac
 share/maxima/${VERSION}/tests/rtest_round.mac