diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index b8e4e36a0..da9398bae 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -71,5 +71,8 @@ Changes since 2.0.3
 
 34) Add CLASSIFY support.
 
-35) Fix iprange support so that ranges in both source and destination work.
+35) Fix iprange support so that ranges in both source and destination
+    work.
+
+36) Remove logunclean and dropunclean
 
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index e8ec7204f..c5f8d88c9 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -889,19 +889,6 @@ validate_interfaces_file() {
 	    case $option in
 		dhcp|norfc1918|nobogons|tcpflags|newnotsyn|arp_filter|routefilter|blacklist|proxyarp|maclist|nosmurfs|-)
 		    ;;
-		dropunclean|logunclean)
-		    if [ -z "$found_obsolete_option" ]; then
-			found_obsolete_option=yes
-			error_message \
-			    "WARNING: The 'dropunclean' and 'logunclean' options are not supported by Shorewall 2.0"
-			error_message \
-			    "         PLEASE STAND BY WHILE SHOREWALL REFORMATS YOUR HARD DRIVE TO REMOVE THESE OPTIONS..."
-			sleep 5
-			error_message "GOTCHA!!!! :-)"
-			error_message \
-			    "         Now please remove these options from your interfaces file -- Thanks"
-		    fi
-		    ;;
 		detectnets)
 		    [ -n "$wildcard" ] && \
 			startup_error "The \"detectnets\" option may not be used with a wild-card interface"
diff --git a/Shorewall2/interfaces b/Shorewall2/interfaces
index 965162db3..3a5d3e93e 100644
--- a/Shorewall2/interfaces
+++ b/Shorewall2/interfaces
@@ -80,7 +80,7 @@
 #                                      option can also be enabled globally in
 #				       the /etc/shorewall/shorewall.conf file.
 #
-#	.	.	blacklist    - Check packets arriving on this interface
+#			blacklist    - Check packets arriving on this interface
 #				       against the /etc/shorewall/blacklist
 #				       file.
 #
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 978b969cc..d857ab0b5 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -125,6 +125,9 @@ Issues when migrating from Shorewall 2.0 to Shorewall 2.1:
 		DNAT	loc	loc:192.168.1.12	tcp	80 \
 			-	130.252.100.69
 
+6)  The 'logunclean' and 'dropunclean' options that were deprecated in
+    Shorewall 2.0 have now been removed completely.
+
 -----------------------------------------------------------------------
 New Features: