diff --git a/lib/configfiles/etch.inc.php b/lib/configfiles/etch.inc.php
index 7d81405c..eb81d0ff 100644
--- a/lib/configfiles/etch.inc.php
+++ b/lib/configfiles/etch.inc.php
@@ -137,8 +137,28 @@ return Array(
 							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
 						),
 						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
+							'newaliases',
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'dkim' => Array(
+						'label' => 'DomainKey filter',
+						'commands_1' => Array(
+							'apt-get install dkim-filter',
+							'mkdir -p /etc/postfix/dkim'
+						),
+						'files' => Array(
+							'dkim-filter.conf' => '/etc/dkim-filter.conf'
+						),
+						'commands_2' => Array(
+							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
+							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
+							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
+							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
+						),
+						'restart' => Array(
+							'/etc/init.d/dkim-filter restart',
+							'/etc/init.d/postfix restart'
 						)
 					),
 					'postfix_mxaccess' => Array(
diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php
index 1a0024e0..03c4f747 100644
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -181,6 +181,7 @@ return Array(
 							'postmap /etc/postfix/mx_access'
 						),
 						'restart' => Array(
+							'newaliases',
 							'/etc/init.d/postfix restart'
 						)
 					),
diff --git a/lib/configfiles/hardy.inc.php b/lib/configfiles/hardy.inc.php
index bda131ec..6f1d3722 100644
--- a/lib/configfiles/hardy.inc.php
+++ b/lib/configfiles/hardy.inc.php
@@ -132,8 +132,28 @@ return Array(
 							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
 						),
 						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
+							'newaliases',
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'dkim' => Array(
+						'label' => 'DomainKey filter',
+						'commands_1' => Array(
+							'apt-get install dkim-filter',
+							'mkdir -p /etc/postfix/dkim'
+						),
+						'files' => Array(
+							'dkim-filter.conf' => '/etc/dkim-filter.conf'
+						),
+						'commands_2' => Array(
+							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
+							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
+							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
+							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
+						),
+						'restart' => Array(
+							'/etc/init.d/dkim-filter restart',
+							'/etc/init.d/postfix restart'
 						)
 					),
 					'postfix_dovecot' => Array(
diff --git a/lib/configfiles/lenny.inc.php b/lib/configfiles/lenny.inc.php
index dd68139c..7470586b 100644
--- a/lib/configfiles/lenny.inc.php
+++ b/lib/configfiles/lenny.inc.php
@@ -133,8 +133,28 @@ return Array(
 							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
 						),
 						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
+							'newaliases',
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'dkim' => Array(
+						'label' => 'DomainKey filter',
+						'commands_1' => Array(
+							'apt-get install dkim-filter',
+							'mkdir -p /etc/postfix/dkim'
+						),
+						'files' => Array(
+							'dkim-filter.conf' => '/etc/dkim-filter.conf'
+						),
+						'commands_2' => Array(
+							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
+							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
+							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
+							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
+						),
+						'restart' => Array(
+							'/etc/init.d/dkim-filter restart',
+							'/etc/init.d/postfix restart'
 						)
 					),
 					'postfix_dovecot' => Array(
diff --git a/lib/configfiles/lucid.inc.php b/lib/configfiles/lucid.inc.php
index 68ff4ac0..2d8ba460 100644
--- a/lib/configfiles/lucid.inc.php
+++ b/lib/configfiles/lucid.inc.php
@@ -133,8 +133,28 @@ return Array(
 							'etc_postfix_sasl_smtpd.conf' => '/etc/postfix/sasl/smtpd.conf'
 						),
 						'restart' => Array(
-							'/etc/init.d/postfix restart',
-							'newaliases'
+							'newaliases',
+							'/etc/init.d/postfix restart'
+						)
+					),
+					'dkim' => Array(
+						'label' => 'DomainKey filter',
+						'commands_1' => Array(
+							'apt-get install dkim-filter',
+							'mkdir -p /etc/postfix/dkim'
+						),
+						'files' => Array(
+							'dkim-filter.conf' => '/etc/dkim-filter.conf'
+						),
+						'commands_2' => Array(
+							'echo "milter_default_action = accept" >> /etc/postfix/main.cf',
+							'echo "milter_protocol = 2" >> /etc/postfix/main.cf',
+							'echo "smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf',
+							'echo "non_smtpd_milters = inet:localhost:8891" >> /etc/postfix/main.cf'
+						),
+						'restart' => Array(
+							'/etc/init.d/dkim-filter restart',
+							'/etc/init.d/postfix restart'
 						)
 					),
 					'postfix_dovecot' => Array(
diff --git a/lib/configfiles/suse10.inc.php b/lib/configfiles/suse10.inc.php
index da94bbe5..4e545cd4 100644
--- a/lib/configfiles/suse10.inc.php
+++ b/lib/configfiles/suse10.inc.php
@@ -93,6 +93,7 @@ return Array(
 							'chgrp postfix /usr/lib/sasl2/smtpd.conf'
 						),
 						'restart' => Array(
+							'newaliases',
 							'/etc/init.d/postfix restart'
 						)
 					),
diff --git a/templates/misc/configfiles/debian_etch/dkim/dkim-filter.conf b/templates/misc/configfiles/debian_etch/dkim/dkim-filter.conf
index 86cdb1b6..84b0b1d4 100644
--- a/templates/misc/configfiles/debian_etch/dkim/dkim-filter.conf
+++ b/templates/misc/configfiles/debian_etch/dkim/dkim-filter.conf
@@ -1,3 +1,10 @@
+#
+# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!!
+#
+# Instead, just set the shown values in the file to the
+# given values ;-)
+#
+
 Syslog			yes
 Domain			/etc/postfix/dkim/domains
 KeyList			/etc/postfix/dkim/dkim-keys.conf
diff --git a/templates/misc/configfiles/debian_lenny/dkim/dkim-filter.conf b/templates/misc/configfiles/debian_lenny/dkim/dkim-filter.conf
index 86cdb1b6..84b0b1d4 100644
--- a/templates/misc/configfiles/debian_lenny/dkim/dkim-filter.conf
+++ b/templates/misc/configfiles/debian_lenny/dkim/dkim-filter.conf
@@ -1,3 +1,10 @@
+#
+# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!!
+#
+# Instead, just set the shown values in the file to the
+# given values ;-)
+#
+
 Syslog			yes
 Domain			/etc/postfix/dkim/domains
 KeyList			/etc/postfix/dkim/dkim-keys.conf
diff --git a/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf b/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf
index 86cdb1b6..84b0b1d4 100644
--- a/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf
+++ b/templates/misc/configfiles/ubuntu_hardy/dkim/dkim-filter.conf
@@ -1,3 +1,10 @@
+#
+# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!!
+#
+# Instead, just set the shown values in the file to the
+# given values ;-)
+#
+
 Syslog			yes
 Domain			/etc/postfix/dkim/domains
 KeyList			/etc/postfix/dkim/dkim-keys.conf
diff --git a/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf b/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf
index eca38be2..6b7d809d 100644
--- a/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf
+++ b/templates/misc/configfiles/ubuntu_lucid/dkim/dkim-filter.conf
@@ -1,3 +1,10 @@
+#
+# !!! DO NOT REPLACE THE ORIGINAL CONFIG WITH THIS FILE !!!
+#
+# Instead, just set the shown values in the file to the
+# given values ;-)
+#
+
 Syslog			yes
 Domain			/etc/postfix/dkim/domains
 KeyList			/etc/postfix/dkim/dkim-keys.conf