diff --git a/CHANGELOG b/CHANGELOG
index 42c371a7b..5ad5abfe7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -25,6 +25,18 @@ ver. 0.6.? (200?/??/??) - ???
   Thanks to Patrick Börjesson
 - Removed 192.168.0.0/16 from ignoreip. Attacks could also
   come from the local network.
+- Robust startup: if iptables module does not get fully
+  initialized after startup of fail2ban, fail2ban will do
+  "maxreinit" attempts to initialize its own firewall. It
+  will sleep between attempts for "polltime" number of
+  seconds (closes Debian: #334272). Thanks to Yaroslav
+  Halchenko
+- Added "interpolations" in fail2ban.conf. This is provided
+  by the ConfigParser module. Old configuration files still
+  work. Thanks to Yaroslav Halchenko
+- Added initial support for hosts.deny and shorewall. Need
+  more testing. Please test. Thanks to kojiro from Gentoo
+  forum for hosts.deny support
 
 ver. 0.6.0 (2005/11/20) - stable
 ----------
diff --git a/MANIFEST b/MANIFEST
index b56a8b73c..227319474 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -18,7 +18,9 @@ utils/process.py
 utils/mail.py
 utils/strings.py
 utils/pidlock.py
-config/fail2ban.conf.default
+config/fail2ban.conf.iptables
+config/fail2ban.conf.shorewall
+config/fail2ban.conf.hostsdeny
 config/gentoo-initd
 config/gentoo-confd
 config/redhat-initd
diff --git a/README b/README
index 0c241a8a7..0b149723c 100644
--- a/README
+++ b/README
@@ -124,7 +124,7 @@ Thanks:
 Kévin Drapel, Marvin Rouge, Sireyessire, Robert Edeker,
 Tom Pike, Iain Lea, Andrey G. Grozin, Yaroslav Halchenko,
 Jonathan Kamens, Stephen Gildea, Markus Hoffmann, Mark
-Edgington, Patrick Börjesson
+Edgington, Patrick Börjesson, kojiro
 
 License:
 --------
diff --git a/setup.py b/setup.py
index a4f096f3b..99b7f0243 100755
--- a/setup.py
+++ b/setup.py
@@ -78,5 +78,5 @@ if obsoleteFiles:
 if argv[1] == "install":
 	print
 	print "Please do not forget to update your configuration file."
-	print "Use config/fail2ban.conf.default as example."
+	print "Use config/fail2ban.conf.* as example."
 	print