diff --git a/Makefile.in b/Makefile.in
index 675d4f8810..23c26e9c62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -548,13 +548,13 @@ jafs: libjafs
 jafsadm: libjafsadm
 
 finale: project cmd comerr afsd allrcmds butc tbutc @ENABLE_KERNEL_MODULE@ libuafs audit kauth log package \
-	ptserver scout bu_utils ubik uss bozo vfsck volser \
+	ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
 	venus update xstat afsmonitor dauth rxdebug libafsrpc \
 	libafsauthent shlibafsrpc shlibafsauthent libadmin
 	${COMPILE_PART1} finale ${COMPILE_PART2}
 
 finale_nolibafs: project cmd comerr afsd allrcmds butc tbutc libuafs audit kauth log package \
-	ptserver scout bu_utils ubik uss bozo vfsck volser \
+	ptserver scout bu_utils ubik uss bozo vfsck volser tvolser \
 	venus update xstat afsmonitor dauth rxdebug libafsrpc \
 	libafsauthent shlibafsrpc shlibafsauthent libadmin
 	${COMPILE_PART1} finale ${COMPILE_PART2}
@@ -609,9 +609,9 @@ clean2:
 	-${COMPILE_PART1} vol ${COMPILE_CLEAN}
 	-${COMPILE_PART1} vlserver ${COMPILE_CLEAN}
 	-${COMPILE_PART1} viced ${COMPILE_CLEAN}
-	-${COMPILE_PART1} viced ${COMPILE_CLEAN}
 	-${COMPILE_PART1} tviced ${COMPILE_CLEAN}
 	-${COMPILE_PART1} volser ${COMPILE_CLEAN}
+	-${COMPILE_PART1} tvolser ${COMPILE_CLEAN}
 	-${COMPILE_PART1} venus ${COMPILE_CLEAN}
 	-${COMPILE_PART1} venus/test ${COMPILE_CLEAN}
 	-${COMPILE_PART1} afsd ${COMPILE_CLEAN}
@@ -782,6 +782,7 @@ distclean: clean
 	src/tests/OpenAFS/Dirpath.pm \
 	src/tsm41/Makefile \
 	src/tviced/Makefile \
+	src/tvolser/Makefile \
 	src/ubik/Makefile \
 	src/update/Makefile \
 	src/usd/test/Makefile \
diff --git a/src/volser/Makefile.in b/src/volser/Makefile.in
index 7833d78028..8a2fbff1d1 100644
--- a/src/volser/Makefile.in
+++ b/src/volser/Makefile.in
@@ -148,7 +148,18 @@ ${DEST}/lib/afs/libvolser.a: libvolser.a
 	${INSTALL} $? $@
 
 ${DEST}/root.server/usr/afs/bin/volserver: volserver
-	${INSTALL} $? $@
+	@case ${SYS_NAME} in \
+	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
+	echo "Don't install volserver for ${SYS_NAME}" ;; \
+	*_darwin_[1-6][0-9]) \
+	echo ${INSTALL} -ns $? $@ ; \
+	${INSTALL} -ns $? $@ ;; \
+	*_darwin_*) \
+	echo "Don't install volserver for ${SYS_NAME}" ;; \
+	*) \
+	echo ${INSTALL} -ns $? $@ ; \
+	${INSTALL} -ns $? $@ ;; \
+	esac
 
 #
 # Misc targets
@@ -184,7 +195,18 @@ ${DESTDIR}${afssrvsbindir}/vos: vos
 	${INSTALL} $? $@
 
 ${DESTDIR}${afssrvlibexecdir}/volserver: volserver
-	${INSTALL} $? $@
+	@case ${SYS_NAME} in \
+	alpha_dux4*|*linux*|rs_aix*|sgi_6*|sun4x*|sunx86*) \
+	echo "Don't install volserver for ${SYS_NAME}" ;; \
+	*_darwin_[1-6][0-9]) \
+	echo ${INSTALL} -ns $? $@ ; \
+	${INSTALL} -ns $? $@ ;; \
+	*_darwin_*) \
+	echo "Don't install volserver for ${SYS_NAME}" ;; \
+	*) \
+	echo ${INSTALL} -ns $? $@ ; \
+	${INSTALL} -ns $? $@ ;; \
+	esac
 
 ${DESTDIR}${libdir}/afs/libvolser.a: libvolser.a
 	${INSTALL} $? $@