@@ -22,11 +22,11 @@
 CSCOPTS=
 INSTALL=install
 SRCFILES =
 
 # all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
-all : $(PREFIX)/bin/.$(ARCHSTR) mtest
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtserve
 # add dboard mtut and tcmt back later
 
 # Configuration stuff
 transport-flavor :
 	@echo Creating transport-flavor with full as flavor. Options include: full, simple
@@ -218,10 +218,16 @@
 $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper
 	@echo Installing to PREFIX=$(PREFIX)
 	$(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest
 	utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest
 	chmod a+x $(PREFIX)/bin/megatest
+
+$(PREFIX)/bin/.$(ARCHSTR)/mtserve : mtserve utils/mk_wrapper
+	@echo Installing to PREFIX=$(PREFIX)
+	$(INSTALL) mtserve $(PREFIX)/bin/.$(ARCHSTR)/mtserve
+	utils/mk_wrapper $(PREFIX) mtserve $(PREFIX)/bin/mtserver
+	chmod a+x $(PREFIX)/bin/mtserver
 
 $(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard
 	$(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard
 
 $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper
@@ -349,11 +355,15 @@
 #          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \
 #          $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 \
 #          $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0
 #  $(PREFIX)/bin/tcmt
 
-install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
+$(PREFIX)/bin/megatest : $(PREFIX)/bin/.$(ARCHSTR)/mtest
+$(PREFIX)/bin/mtserver : $(PREFIX)/bin/.$(ARCHSTR)/mtserve
+
+install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest \
+	  $(PREFIX)/bin/megatest $(PREFIX)/bin/mtserver \
           $(HELPERS) $(PREFIX)/bin/nbfake \
 	  $(PREFIX)/bin/serialize-env \
 	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(PREFIX)/bin/mt_xterm \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
 	  $(PREFIX)/share/db/mt-pg.sql \