diff --git a/doc/userguide/output/custom-tls-logging.rst b/doc/userguide/output/custom-tls-logging.rst
index 18af79ce14..682d320451 100644
--- a/doc/userguide/output/custom-tls-logging.rst
+++ b/doc/userguide/output/custom-tls-logging.rst
@@ -18,7 +18,7 @@ And in your tls.log file you would get the following, for example:
 
 ::
 
- 12/03/16-19:20:14.85859 10.10.10.4:58274 -> 192.0.78.24:443 VERSION='TLS 1.2' suricata-ids.org NOTBEFORE='2016-10-27T20:36:00' NOTAFTER='2017-01-25T20:36:00'
+ 12/03/16-19:20:14.85859 10.10.10.4:58274 -> 192.0.78.24:443 VERSION='TLS 1.2' suricata.io NOTBEFORE='2016-10-27T20:36:00' NOTAFTER='2017-01-25T20:36:00'
 
 The list of supported format strings is the following:
 
diff --git a/doc/userguide/output/eve/eve-json-format.rst b/doc/userguide/output/eve/eve-json-format.rst
index d68f9cf4aa..926a7c468a 100644
--- a/doc/userguide/output/eve/eve-json-format.rst
+++ b/doc/userguide/output/eve/eve-json-format.rst
@@ -544,19 +544,19 @@ Example of a DNS answer with "detailed" format:
       "rcode": "NOERROR",
       "answers": [
         {
-          "rrname": "www.suricata-ids.org",
+          "rrname": "www.suricata.io",
           "rrtype": "CNAME",
           "ttl": 3324,
-          "rdata": "suricata-ids.org"
+          "rdata": "suricata.io"
         },
         {
-          "rrname": "suricata-ids.org",
+          "rrname": "suricata.io",
           "rrtype": "A",
           "ttl": 10,
           "rdata": "192.0.78.24"
         },
         {
-          "rrname": "suricata-ids.org",
+          "rrname": "suricata.io",
           "rrtype": "A",
           "ttl": 10,
           "rdata": "192.0.78.25"
@@ -583,7 +583,7 @@ Example of a DNS answer with "grouped" format:
           "192.0.78.25"
         ],
         "CNAME": [
-          "suricata-ids.org"
+          "suricata.io"
         ]
       }
   }
diff --git a/doc/userguide/output/eve/eve-json-output.rst b/doc/userguide/output/eve/eve-json-output.rst
index e13e5e10f6..17e7ea2bab 100644
--- a/doc/userguide/output/eve/eve-json-output.rst
+++ b/doc/userguide/output/eve/eve-json-output.rst
@@ -485,4 +485,4 @@ engine configurations. When these tenants are configured and the detection
 engine is running then all EVE logging will also report the ``tenant_id`` field
 for traffic matching a specific tenant.
 
-.. _deprecation policy: https://suricata-ids.org/about/deprecation-policy/
+.. _deprecation policy: https://suricata.io/our-story/deprecation-policy/
diff --git a/qa/prscript.py b/qa/prscript.py
index c9d7eec736..10c090f549 100755
--- a/qa/prscript.py
+++ b/qa/prscript.py
@@ -217,7 +217,7 @@ def FindBuild(branch, extension = "", builder_name = None):
 def GetBuildStatus(builder, buildid, extension="", builder_name = None):
     if builder_name == None:
         builder_name = username + extension
-    # https://buildbot.suricata-ids.org/json/builders/build%20deb6/builds/11
+    # https://buildbot.oisf.net/json/builders/build%20deb6/builds/11
     request = urllib.request.Request(JSON_BUILDERS_URI + builder_name + '/builds/' + str(buildid))
     page = urllib.request.urlopen(request)
     result = page.read()
diff --git a/src/detect-parse.c b/src/detect-parse.c
index f25a9f1efa..d316be6db8 100644
--- a/src/detect-parse.c
+++ b/src/detect-parse.c
@@ -719,7 +719,7 @@ static int SigParseOptions(DetectEngineCtx *de_ctx, Signature *s, char *optstr,
     s->init_data->negated = false;
 
     if (st->flags & SIGMATCH_INFO_DEPRECATED) {
-#define URL "https://suricata-ids.org/about/deprecation-policy/"
+#define URL "https://suricata.io/our-story/deprecation-policy/"
         if (st->alternative == 0)
             SCLogWarning(SC_WARN_DEPRECATED, "keyword '%s' is deprecated "
                     "and will be removed soon. See %s", st->name, URL);