diff --git a/Rocksolid_Light/rocksolid/lib/post.inc.php b/Rocksolid_Light/rocksolid/lib/post.inc.php
index 9ab85a3..f13cf92 100644
--- a/Rocksolid_Light/rocksolid/lib/post.inc.php
+++ b/Rocksolid_Light/rocksolid/lib/post.inc.php
@@ -519,10 +519,14 @@ function message_post($subject, $from, $newsgroups, $ref, $body, $encryptthis =
             fputs($ns, 'Followup-To: ' . $followupto . "\r\n");
         }
         fputs($ns, 'Newsgroups: ' . $newsgroups . "\r\n");
-        $sitekey = password_hash($CONFIG['thissitekey'] . $msgid, PASSWORD_DEFAULT);
-        $posting_user = hash('sha1', $from . $CONFIG['thissitekey'] . $_SERVER['HTTP_HOST']);
-        fputs($ns, 'X-Rslight-Site: ' . $sitekey . "\r\n");
-        fputs($ns, 'X-Rslight-Posting-User: ' . $posting_user . "\r\n");
+
+        if (! isset($OVERRIDES['disable_rslight_headers']) || $OVERRIDES['disable_rslight_headers'] != true) {
+            $sitekey = password_hash($CONFIG['thissitekey'] . $msgid, PASSWORD_DEFAULT);
+            $posting_user = hash('sha1', $from . $CONFIG['thissitekey'] . $_SERVER['HTTP_HOST']);
+            fputs($ns, 'X-Rslight-Site: ' . $sitekey . "\r\n");
+            fputs($ns, 'X-Rslight-Posting-User: ' . $posting_user . "\r\n");
+        }
+
         if (isset($encryptthis)) {
             fputs($ns, 'X-Rslight-To: ' . $encryptto . "\r\n");
             $CONFIG['postfooter'] = "";
diff --git a/Rocksolid_Light/rslight/overrides.inc.php.dist b/Rocksolid_Light/rslight/overrides.inc.php.dist
index dd33c49..1b6bfed 100644
--- a/Rocksolid_Light/rslight/overrides.inc.php.dist
+++ b/Rocksolid_Light/rslight/overrides.inc.php.dist
@@ -61,6 +61,10 @@ return [
     // Disable New Articles link on groups page
     'overboard_disable_new_link' => false,
 
+    // Disable adding 'X-Rslight-*' headers to
+    // outgoing messages
+    'disable_rslight_headers' => false,
+
     // Set User-Agent: string (default = 'Rocksolid Light')
     // Set to '' for no User-Agent: header
     'user_agent' => 'Rocksolid Light',