diff --git a/etc/inetd.conf b/etc/inetd.conf
index 3e306c61d5a7..4e8bf79ccca5 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -111,7 +111,9 @@
 #smtp	stream	tcp	nowait	qmaild	/var/qmail/bin/tcp-env	tcp-env /var/qmail/bin/qmail-smtpd
 #
 # Enable the following two entries to enable samba startup from inetd
-# (from the Samba documentation).
+# (from the Samba documentation).  Enable the third entry to enable the swat
+# samba configuration tool.
 #
 #netbios-ssn stream tcp nowait root /usr/local/sbin/smbd smbd 
 #netbios-ns dgram udp wait root /usr/local/sbin/nmbd nmbd 
+#swat stream tcp nowait.400 root /usr/local/sbin/swat swat
diff --git a/etc/services b/etc/services
index 24f95c4e4b2c..8f14cd0e825e 100644
--- a/etc/services
+++ b/etc/services
@@ -1199,6 +1199,7 @@ rsync		873/tcp
 rsync		873/udp
 accessbuilder	888/tcp
 accessbuilder	888/udp
+swat		901/tcp			# samba web configuration tool
 ftps-data	989/tcp			# ftp protocol, data, over TLS/SSL
 ftps-data	989/udp
 ftps		990/tcp			# ftp protocol, control, over TLS/SSL