diff --git a/ChangeLog b/ChangeLog
index eea249d3d..26729b5bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-06  Roland Illig  <roland.illig@gmx.de>
+
+	* FAQ: Answered the slow startup related to old Samba code.
+
 2007-10-19  Pavel Tsekov  <ptsekov@gmx.net>
 
 	* NEWS: Update for 4.6.2.
diff --git a/FAQ b/FAQ
index 93f6d16d4..9cc7e5242 100644
--- a/FAQ
+++ b/FAQ
@@ -735,6 +735,15 @@ indenting increases with each line!
 
 9.2 When I start Midnight Commander, nothing happens!
 
+   When MC is compiled with Samba support, have a look at the
+   "interfaces = ..." line in your smb.conf file. MC uses pretty old
+   Samba code that only expects IP addresses and host names there,
+   but not network interface names (like eth0). MC interprets these
+   names as host names and tries to resolve them using a DNS server.
+   To fix this, ask your system administrator to change the interface
+   names to their assigned IP addresses, or (untried) add the interface
+   names and their IP addresses to the /etc/hosts file.
+
    First, invoke MC without subshell support: "mc -u".  If this helps
    check the shell you are using.  Subshell support works best with
    bash, although tcsh and zsh are also supported.  You might want to