diff --git a/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md b/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md
index bd69c61d..87f9f000 100644
--- a/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md
+++ b/en_US/howto/1-completely.disable.amavisd.clamav.spamassassin.md
@@ -33,13 +33,11 @@ Uncomment above lines (removing "# " at the beginning of each line), and restart
 You may want to stop and disable ClamAV service too since it's not
 called by Amavisd or other programs anymore:
 
-    On CentOS, the systemd script for Amavisd service
-    (`/lib/systemd/system/amavisd.service`) has line
-    `Wants=clamd@amavisd.service`, this makes systemd to start `clamd@amavisd`
-    service each time before starting `amavisd` service, so you have to comment
-    out this line to disable clamav service.
-
 ```
+# CentOS
+systemctl disable --now clamd@amavisd
+systemctl restart amavisd
+
 # Debian/Ubuntu
 systemctl disable --now clamav-daemon
 systemctl restart amavis
@@ -53,6 +51,22 @@ rcctl disable clamd
 rcctl restart amavisd
 ```
 
+You may want to remove the packages also:
+
+```
+# CentOS
+yum remove clamav clamav-lib
+
+# Debian/Ubuntu
+apt remove clamav-base
+
+# FreeBSD
+pkg remove clamav
+
+# OpenBSD
+pkg_delete clamav
+```
+
 ### Completely disable all features
 
 If you want to completely disable spam and virus scanning services, steps:
diff --git a/html/completely.disable.amavisd.clamav.spamassassin.html b/html/completely.disable.amavisd.clamav.spamassassin.html
index 4a2fb25e..ca8b0c66 100644
--- a/html/completely.disable.amavisd.clamav.spamassassin.html
+++ b/html/completely.disable.amavisd.clamav.spamassassin.html
@@ -61,13 +61,11 @@
 <p>Uncomment above lines (removing "# " at the beginning of each line), and restart Amavisd service.</p>
 <p>You may want to stop and disable ClamAV service too since it's not
 called by Amavisd or other programs anymore:</p>
-<pre><code>On CentOS, the systemd script for Amavisd service
-(`/lib/systemd/system/amavisd.service`) has line
-`Wants=clamd@amavisd.service`, this makes systemd to start `clamd@amavisd`
-service each time before starting `amavisd` service, so you have to comment
-out this line to disable clamav service.
-</code></pre>
-<pre><code># Debian/Ubuntu
+<pre><code># CentOS
+systemctl disable --now clamd@amavisd
+systemctl restart amavisd
+
+# Debian/Ubuntu
 systemctl disable --now clamav-daemon
 systemctl restart amavis
 
@@ -80,6 +78,20 @@ rcctl disable clamd
 rcctl restart amavisd
 </code></pre>
 
+<p>You may want to remove the packages also:</p>
+<pre><code># CentOS
+yum remove clamav clamav-lib
+
+# Debian/Ubuntu
+apt remove clamav-base
+
+# FreeBSD
+pkg remove clamav
+
+# OpenBSD
+pkg_delete clamav
+</code></pre>
+
 <h3 id="completely-disable-all-features">Completely disable all features</h3>
 <p>If you want to completely disable spam and virus scanning services, steps:</p>
 <ul>