diff --git a/CHANGES b/CHANGES
index c8d5cf61b8..a232ce3d5c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-261 | 2019-05-02 20:49:23 -0700
+
+  * Remove previously deprecated policy/protocols/smb/__load__ (Jon Siwek, Corelight)
+
 2.6-260 | 2019-05-02 19:16:48 -0700
 
   * GH-243: Remove deprecated functions/events from 2.6 and earlier (Johanna Amann, Corelight)
diff --git a/NEWS b/NEWS
index e7c88fee8a..b9bd761b07 100644
--- a/NEWS
+++ b/NEWS
@@ -243,6 +243,9 @@ Removed Functionality
     - ``dhcp_request``
     - ``finished_send_state``
 
+- The deprecated script ``policy/protocols/smb/__load__.bro`` was removed.
+  Instead of ``@load policy/protocols/smb`` use ``@load base/protocols/smb``.
+
 Deprecated Functionality
 ------------------------
 
diff --git a/VERSION b/VERSION
index c40efd81c6..55568b13e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-260
+2.6-261
diff --git a/doc b/doc
index ed52b61d93..f897256ad2 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit ed52b61d9300141cfa868759faed9c66142a80af
+Subproject commit f897256ad219b644b99a14873473e0276cf430f6
diff --git a/scripts/policy/protocols/smb/__load__.zeek b/scripts/policy/protocols/smb/__load__.zeek
deleted file mode 100644
index 9e826f7fd6..0000000000
--- a/scripts/policy/protocols/smb/__load__.zeek
+++ /dev/null
@@ -1,3 +0,0 @@
-@deprecated "Use '@load base/protocols/smb' instead"
-
-@load base/protocols/smb
diff --git a/scripts/test-all-policy.zeek b/scripts/test-all-policy.zeek
index 0968c038ee..0eadf0ff57 100644
--- a/scripts/test-all-policy.zeek
+++ b/scripts/test-all-policy.zeek
@@ -83,7 +83,6 @@
 @load protocols/modbus/track-memmap.zeek
 @load protocols/mysql/software.zeek
 @load protocols/rdp/indicate_ssl.zeek
-#@load protocols/smb/__load__.zeek
 @load protocols/smb/log-cmds.zeek
 @load protocols/smtp/blocklists.zeek
 @load protocols/smtp/detect-suspicious-orig.zeek
diff --git a/scripts/zeexygen/__load__.zeek b/scripts/zeexygen/__load__.zeek
index d074fe3660..00555c57bd 100644
--- a/scripts/zeexygen/__load__.zeek
+++ b/scripts/zeexygen/__load__.zeek
@@ -6,7 +6,6 @@
 @load frameworks/control/controller.zeek
 @load frameworks/files/extract-all-files.zeek
 @load policy/misc/dump-events.zeek
-@load policy/protocols/smb/__load__.zeek
 
 @load ./example.zeek
 
diff --git a/testing/btest/Baseline/coverage.bare-mode-errors/errors b/testing/btest/Baseline/coverage.bare-mode-errors/errors
index 72de702972..e69de29bb2 100644
--- a/testing/btest/Baseline/coverage.bare-mode-errors/errors
+++ b/testing/btest/Baseline/coverage.bare-mode-errors/errors
@@ -1,2 +0,0 @@
-warning in /Users/johanna/bro/master/scripts/policy/protocols/smb/__load__.zeek, line 1: deprecated script loaded from /Users/johanna/bro/master/testing/btest/../../scripts//zeexygen/__load__.zeek:9 "Use '@load base/protocols/smb' instead"
-warning in /Users/johanna/bro/master/testing/btest/../../scripts//policy/protocols/smb/__load__.zeek, line 1: deprecated script loaded from command line arguments "Use '@load base/protocols/smb' instead"