diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index 5f7eb24d1..d693b053c 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -6,6 +6,8 @@ Changes in Shorewall 4.4.11.4
 
 3)  Fix exclusion in the blacklist file
 
+4)  Fix optional interface with 'upnpclient'.
+
 Changes in Shorewall 4.4.11.3
 
 1)  Fix duplicate rule generation with 'any'.
diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt
index 7d15cd06d..42ab190f8 100644
--- a/Shorewall/known_problems.txt
+++ b/Shorewall/known_problems.txt
@@ -112,3 +112,8 @@
     then ignored when generating iptables (ip6tables) input.
 
     Workaround: Do not use exclusion in the blacklist file.
+
+17) The interface options combination of 'optional' and 'upnpclient'
+    does not work correctly.
+
+    Workaround: Do not use these two options on the same interface.