diff --git a/ChangeLog b/ChangeLog
index 4180671..2a10b99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1740,7 +1740,7 @@ Tue Oct 12 10:27:08 1993  Matti Aarnio  (mea@nic.funet.fi)
 
 	* Implemented dual spool system: (configurable)
 		/usr/spool/bitnet/LINKNAME/   - for transmission links
-		/usr/spool/bitspool/USERNAME/ - for local users
+		/var/spool/bitspool/USERNAME/ - for local users
 
 	* Wrote UNIX man-pages of the system
 
diff --git a/Makefile b/Makefile
index c03f41e..397d2bd 100644
--- a/Makefile
+++ b/Makefile
@@ -393,6 +393,9 @@ install:
 	mkdir -p /var/spool/bitnet
 	chgrp ${NJEGRP} /var/spool/bitnet
 	chmod g+w  /var/spool/bitnet
+	mkdir -p /var/spool/bitspool
+	chgrp ${NJEGRP} /var/spool/bitspool
+	chmod g=rx,o-rwx /var/spool/bitspool
 	chmod g+s ${BINDIR}/sendfile ${BINDIR}/tell ${BINDIR}/ygone \
 		 ${LIBDIR}/bmail
 	$(INSTALL) -s -m 755 transfer ${LIBDIR}/transfer
diff --git a/README.INSTALL b/README.INSTALL
index 222902d..e5f93c1 100644
--- a/README.INSTALL
+++ b/README.INSTALL
@@ -51,7 +51,7 @@ In  detach.c:
 	 inheritance)
 
 	Decide where you put your user spool directories, exaple:
-		/usr/spool/bitspool
+		/var/spool/bitspool
 	However HAVE THEM ON SAME PHYSICAL DEVICE so that rename(2)
 	(or rename(3)) can be used successfully to place files into
 	there.  Directory can have protection 111, or 555.  Nobody
diff --git a/file-exit.cf b/file-exit.cf
index 6a55a4b..d940eba 100644
--- a/file-exit.cf
+++ b/file-exit.cf
@@ -16,8 +16,8 @@
 #	  Exit users:  POSTMAST	 (exits start as root anyway.)
 #	  Exited reals: real protections, programs start with setuid() user.
 
-Spool-Dir:	/usr/spool/bitspool/
-Postmast-Dir:	/usr/spool/bitspool/POSTMAST
+Spool-Dir:	/var/spool/bitspool/
+Postmast-Dir:	/var/spool/bitspool/POSTMAST
 
 # Now list of things to match and then what to do
 # To do keywords:	DISCARD to /dev/null.
diff --git a/funetnje.texinfo b/funetnje.texinfo
index 704ab99..8a61ecc 100644
--- a/funetnje.texinfo
+++ b/funetnje.texinfo
@@ -698,8 +698,8 @@ Such wrapping is not allowed in the real configuration file!
 #         Exited reals: real protections, programs start with setuid()
 #                       user.
 
-Spool-Dir:      /usr/spool/bitspool/
-Postmast-Dir:   /usr/spool/bitspool/POSTMAST
+Spool-Dir:      /var/spool/bitspool/
+Postmast-Dir:   /var/spool/bitspool/POSTMAST
 
 # Now list of things to match and then what to do
 # To do keywords:       DISCARD to /dev/null.
@@ -988,7 +988,7 @@ communication with the BITNET.
 Shows a listing of user's BITNET spool -- the `reader'.
 @example
 @cartouche
-QRDR: Spool dir: `/usr/spool/bitspool/MEA/'
+QRDR: Spool dir: `/var/spool/bitspool/MEA/'
 From:             To:               FName:   FExt:    Type  Form:    SpoolID
 NETSERV@@FINHUT    MEA@@FINFILES      NETSERV  NOTE     PUN A QUFINHUT 0001
 NETSERV@@FINHUT    MEA@@FINFILES      NETSERV  NOTE     PUN A QUFINHUT 0002
@@ -1016,7 +1016,7 @@ consulted with effective uid.
 Spool directory is determined using same mechanism as in @emph{funetnje}
 main program.
 Sample configuration of file procesing exits gives  directory
-@file{/usr/spool/bitspool}  in  which UPPERCASE userids
+@file{/var/spool/bitspool}  in  which UPPERCASE userids
 (or pseudoids - MAILER is one such) are  `user' specific
 subdirectories containing individual spooled files.
 
diff --git a/man/funetnje.8 b/man/funetnje.8
index cae7ca4..a6db094 100644
--- a/man/funetnje.8
+++ b/man/funetnje.8
@@ -163,8 +163,8 @@ Sample
 \f4#   Exit users:  POSTMAST  (exits start as root anyway.)
 \f4#   Exited reals: real protections, programs start with setuid() user.
 \f4 
-\f4Spool-Dir:      /usr/spool/bitspool/
-\f4Postmast-Dir:   /usr/spool/bitspool/POSTMAST
+\f4Spool-Dir:      /var/spool/bitspool/
+\f4Postmast-Dir:   /var/spool/bitspool/POSTMAST
 \f4 
 \f4# Now list of things to match and then what to do
 \f4# To do keywords:       DISCARD  to /dev/null.
@@ -352,7 +352,7 @@ binary format.  Transporter internal usage.
 Recipient spool directories have also these
 .B .spoolid
 files, and their function is similar; keep status log.
-.IP "\fB/usr/spool/bitspool/\fR" 1.0i 0
+.IP "\fB/var/spool/bitspool/\fR" 1.0i 0
 Configured (via exit files)
 .SM `Spool-Dir:'
 under which local recipients will get their own subdirectories..
diff --git a/man/funetnje.8.ps b/man/funetnje.8.ps
index 44508a1..66f82d4 100644
Binary files a/man/funetnje.8.ps and b/man/funetnje.8.ps differ
diff --git a/man/qrdr.8 b/man/qrdr.8
index 17366e3..7d3a545 100644
--- a/man/qrdr.8
+++ b/man/qrdr.8
@@ -50,7 +50,7 @@ effective uid.
 Spool directory is determined using same mechanism as in
 .I funetnje
 main program.  Sample configuration of file procesing exits gives directory
-.RI ` /usr/spool/bitspool '
+.RI ` /var/spool/bitspool '
 in which UPPERCASE userids (or pseudoids - MAILER is one such) are `user'
 specific subdirectories containing individual spooled files.
 .LP
@@ -72,7 +72,7 @@ output for user
 .LP
 .nf
 .fz 4 -2
-\f4QRDR: Spool dir: `/usr/spool/bitspool/MEA/'
+\f4QRDR: Spool dir: `/var/spool/bitspool/MEA/'
 \f4From:             To:               FName:   FExt:    Type  Form:    SpoolID
 \f4NETSERV@FINHUT    MEA@FINFILES      NETSERV  NOTE     PUN A QUFINHUT 0002
 \f4NETSERV@FINHUT    MEA@FINFILES      NETSERV  NOTE     PUN A QUFINHUT 0004
diff --git a/man/qrdr.8.ps b/man/qrdr.8.ps
index f56a963..905292a 100644
Binary files a/man/qrdr.8.ps and b/man/qrdr.8.ps differ