diff --git a/GNUmakefile.in b/GNUmakefile.in
index f7e4ff32f7caeef59e5b6920d67b271733c0d321..9eac7d2c1b4c580ebe5a5617265785d3cab08770 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -52,6 +52,8 @@ ops-install:
 install-mkdirs:
 	-mkdir -p $(INSTALL_TOPDIR)/locks
 	-mkdir -p $(INSTALL_TOPDIR)/log
+	-mkdir -p $(INSTALL_TOPDIR)/log/mysql
+	-mkdir -p $(INSTALL_TOPDIR)/log/exports
 	-mkdir -p $(INSTALL_TOPDIR)/lists
 	-mkdir -p $(INSTALL_TOPDIR)/backup
 	-mkdir -p $(INSTALL_TOPDIR)/batch
diff --git a/doc/setup.txt b/doc/setup.txt
index ce803554e1f99b2355e7e2faafe36fb196282068..b57388943b3f78bee1a5d0b524c05a29d5ea5b36 100644
--- a/doc/setup.txt
+++ b/doc/setup.txt
@@ -145,9 +145,6 @@ See the file setup-db.txt in this directory
 
 ##### Step 5 - Directories to create, and other misc. filesystem changes
 
-Logs - Create /usr/testbed/log, and link /var/log/testbed to it . Create
-'tiplogs', 'mysql', and 'exports' subdirectories in this directory.
-
 NFS - Make the machine an NFS server and client with the following in
 /etc/rc.conf:
 nfs_server_enable="YES"