diff --git a/Makefile.clang b/Makefile.clang
index d8c88459..021f2529 100644
--- a/Makefile.clang
+++ b/Makefile.clang
@@ -3,7 +3,7 @@ CC       = clang
 CXX      = clang++
 AR       = ar
 RANLIB   = ranlib
-CFLAGS   =  -DWITHTEST 
+CFLAGS   =  -DWITHTEST
 CXXFLAGS =  -DWITHTEST -I.
 LFLAGS   = -lamathapp -lcomplex -lamath -lcamath -lstdc++
 
@@ -443,6 +443,14 @@ amigacatalogs:
 	${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog
 	${FLXCAT} text/keyword.cd catalog/dansk/amath-keyword.ct CATALOG dist/catalog/dansk/amath-keyword.catalog
 
+.PHONY: test
+test: app
+	./amath test
+
+.PHONY: install
+install: app
+	install -m 0755 amath $(DESTDIR)$(PREFIX)/bin
+
 clean:
 	${DEL}  aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o  acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o  cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o  alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o memoo.o  evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_posix.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o libamath.a libcamath.a libcomplex.a libamathapp.a amath
 
diff --git a/configure b/configure
index 7a3c14c5..632b46cb 100755
--- a/configure
+++ b/configure
@@ -377,6 +377,14 @@ if $VALID ; then
 	echo "	\${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog"
 	echo "	\${FLXCAT} text/keyword.cd catalog/dansk/amath-keyword.ct CATALOG dist/catalog/dansk/amath-keyword.catalog"
 	echo
+	echo ".PHONY: test"
+	echo "test: app"
+	echo "	./amath test"
+	echo
+	echo ".PHONY: install"
+	echo "install: app"
+	echo "	install -m 0755 amath \$(DESTDIR)\$(PREFIX)/bin"
+	echo
 	echo "clean:"
 	echo "	\${DEL} ${libapp} ${libamath} ${libcomplex} ${libc} ${l} libamath${outext}.a libcamath${outext}.a libcomplex${outext}.a libamathapp${outext}.a amath${outext}"
 	echo