diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index a5edbe0684cfaba1f10c803f06c9b9b9525451c3..b5237dfb4f642fc87b925f301cad245cc122b9aa 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.2 1993/10/10 11:38:40 ceder Exp $
+# $Id: Makefile.in,v 1.3 1994/02/24 10:38:51 ceder Exp $
 # Copyright (C) 1991  Lysator Academic Computer Association.
 #
 # This file is part of the LysKOM server.
@@ -23,39 +23,34 @@
 # Please mail bug reports to bug-lyskom@lysator.liu.se. 
 #
 @STDLYSKOM@
-# +++FIXME-denna fil {r ej klar!
-MANDIR = /usr/local/man
-MANEXTS = 1 3 5 8
+
+man5dir = \$(prefix)/man/man5\\
+man8dir = \$(prefix)/man/man8\\
+man5ext = .5\\
+man8ext = .8\\
+
+# List of man pages in the various sections to install
+MAN5 = lyskom
+MAN8 = dbck lyskomd updateLysKOM
 
 all:;
 depend:;
 
-clean:
+@CLEAN@
+dopure: dorealclean
+dorealclean: dodistclean;
+dodistclean: doclean
+	$(RM) $(GENERIC-DISTCLEAN)
+doclean: domostlyclean
+domostlyclean:
 	$(RM) $(GENERIC-MOSTLYCLEAN)
-	for i in $(MANEXTS); \
-	do \
-	   if [ -d man$$i ] ;then echo making clean in directory man$$i; \
-	   (cd man$$i; $(RM) *~ core) ;fi \
-	done
 
-distclean: clean
-	$(RM) $(GENERIC-DISTCLEAN)
-	-for i in $(MANEXTS); \
+install:
+	-for i in $(MAN5); \
 	do \
-	   [ -d man$$i ] && { echo making clean in directory man$$i; \
-	   (cd man$$i; $(RM) *.ps *.cat *.man *.txt $(GENERIC-DIST-CLEAN)) } \
+		$(INSTALL_DATA) $$i.5 $(man5dir)/$$i.$(man5ext); \
 	done
-
-pure:;
-realclean:;
-mostlyclean:;
-
-install:
-	for i in $(MANEXTS); \
+	-for i in $(MAN8); \
 	do \
-	   [ -d man$$i ] && { for page in man$$i/*.$$i; \
-	   do \
-	      echo installing $$page; \
-	      install $$page $(MANDIR)/man$$i; \
-	   done } \
+		$(INSTALL_DATA) $$i.8 $(man8dir)/$$i.$(man8ext); \
 	done
diff --git a/doc/man/Makefile.src b/doc/man/Makefile.src
index 0319d989b7e28ee2fdf33737523c0370809750d7..94c0a9f2c06050543bebf9f02c9b9f40f67330e0 100644
--- a/doc/man/Makefile.src
+++ b/doc/man/Makefile.src
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.src,v 1.2 1993/10/10 11:38:40 ceder Exp $
+# $Id: Makefile.src,v 1.3 1994/02/24 10:38:51 ceder Exp $
 # Copyright (C) 1991  Lysator Academic Computer Association.
 #
 # This file is part of the LysKOM server.
@@ -23,39 +23,34 @@
 # Please mail bug reports to bug-lyskom@lysator.liu.se. 
 #
 @STDLYSKOM@
-# +++FIXME-denna fil {r ej klar!
-MANDIR = /usr/local/man
-MANEXTS = 1 3 5 8
+
+man5dir = \$(prefix)/man/man5\\
+man8dir = \$(prefix)/man/man8\\
+man5ext = .5\\
+man8ext = .8\\
+
+# List of man pages in the various sections to install
+MAN5 = lyskom
+MAN8 = dbck lyskomd updateLysKOM
 
 all:;
 depend:;
 
-clean:
+@CLEAN@
+dopure: dorealclean
+dorealclean: dodistclean;
+dodistclean: doclean
+	$(RM) $(GENERIC-DISTCLEAN)
+doclean: domostlyclean
+domostlyclean:
 	$(RM) $(GENERIC-MOSTLYCLEAN)
-	for i in $(MANEXTS); \
-	do \
-	   if [ -d man$$i ] ;then echo making clean in directory man$$i; \
-	   (cd man$$i; $(RM) *~ core) ;fi \
-	done
 
-distclean: clean
-	$(RM) $(GENERIC-DISTCLEAN)
-	-for i in $(MANEXTS); \
+install:
+	-for i in $(MAN5); \
 	do \
-	   [ -d man$$i ] && { echo making clean in directory man$$i; \
-	   (cd man$$i; $(RM) *.ps *.cat *.man *.txt $(GENERIC-DIST-CLEAN)) } \
+		$(INSTALL_DATA) $$i.5 $(man5dir)/$$i.$(man5ext); \
 	done
-
-pure:;
-realclean:;
-mostlyclean:;
-
-install:
-	for i in $(MANEXTS); \
+	-for i in $(MAN8); \
 	do \
-	   [ -d man$$i ] && { for page in man$$i/*.$$i; \
-	   do \
-	      echo installing $$page; \
-	      install $$page $(MANDIR)/man$$i; \
-	   done } \
+		$(INSTALL_DATA) $$i.8 $(man8dir)/$$i.$(man8ext); \
 	done