diff --git a/Shorewall/Documenation.txt b/Shorewall/Documenation
similarity index 100%
rename from Shorewall/Documenation.txt
rename to Shorewall/Documenation
diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index f6d23e550..66ce49d20 100644
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -11,6 +11,8 @@ Changes in 3.3.4
 
 5)  Only compile traffic shaping once.
 
+6)  Move config file documentary comments to a separate file.
+
 Changes in 3.3.4
 
 1)  Make exclusion work with "show zones"
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index f647c40d2..58327c1bd 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -261,7 +261,7 @@ chmod 755 ${PREFIX}/etc/shorewall
 chmod 755 ${PREFIX}/usr/share/shorewall
 chmod 755 ${PREFIX}/usr/share/shorewall/configfiles
 
-run_install $OWNERSHIP -m 0644 Documentation.txt ${PREFIX}/etc/shorewall/Documentation.txt
+run_install $OWNERSHIP -m 0644 Documentation ${PREFIX}/etc/shorewall/Documentation
 #
 # Install the config file
 #
diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt
index d7148d7a7..b1519c0bb 100644
--- a/Shorewall/releasenotes.txt
+++ b/Shorewall/releasenotes.txt
@@ -47,6 +47,14 @@ Other Changes in 3.3.5.
     networks are defined using the 'ipsec' option in
     /etc/shorewall/hosts).
 
+2)  From the beginning, the Shorewall configuration files in
+    /etc/shorewall/ have contained documentary comments. While these
+    comments are useful, they present an upgrade problem. Beginning
+    with this release, these comments are removed from the
+    configuration files themselves and are gathered together in a
+    single file /etc/shorewall/Documentation. The documentation is in
+    alphabetical order by file name.
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 0edef4b5f..473ade250 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -68,7 +68,7 @@ fi
 %attr(0755,root,root) %dir /usr/share/shorewall
 %attr(0755,root,root) %dir /usr/share/shorewall/configfiles
 %attr(0700,root,root) %dir /var/lib/shorewall
-%attr(0644,root,root) %config(noreplace) /etc/shorewall/Documentation.txt
+%attr(0644,root,root) %config(noreplace) /etc/shorewall/Documentation
 %attr(0644,root,root) %config(noreplace) /etc/shorewall/shorewall.conf
 %attr(0600,root,root) %config(noreplace) /etc/shorewall/zones
 %attr(0600,root,root) %config(noreplace) /etc/shorewall/policy