diff --git a/doc/Changelog b/doc/Changelog
index abf5897..1f52161 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -13,6 +13,10 @@ sysvinit (2.92) unreleased; urgency=low
       Closes Debian bug #614893.
       Patch provided by Andreas Fackler.
     * Removed unused Version variable from wall.c.
+    * Updated halt/reboot manual page to acknowledge the -i
+      flag may not properly shut down network interfaces if the interface
+      does not have an IP address.
+      Addresses Debian bug #361935.
 
 
 sysvinit (2.91) world; urgency=low
diff --git a/man/halt.8 b/man/halt.8
index beea730..6f94e02 100644
--- a/man/halt.8
+++ b/man/halt.8
@@ -78,6 +78,8 @@ Don't write the wtmp record.
 Force halt or reboot, don't call \fBshutdown\fP(8).
 .IP \fB\-i\fP
 Shut down all network interfaces just before halt or reboot.
+Warning: This may not work on interfaces which do not have an IP address
+and should ideally be handled by a network manager service.
 .IP \fB\-h\fP
 Put all hard drives on the system in stand-by mode just before halt or power-off.
 .IP \fB\-p\fP