diff --git a/src/detect-engine.c b/src/detect-engine.c
index 422a5aed61..665ae35420 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -77,6 +77,10 @@ static void *DetectEngineLiveRuleSwap(void *arg)
 {
     SCEnter();
 
+    if (SCSetThreadName("LiveRuleSwap") < 0) {
+        SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
+    }
+
     SCLogInfo("===== Starting live rule swap triggered by user signal USR2 =====");
 
     ThreadVars *tv_local = (ThreadVars *)arg;
diff --git a/src/suricata.c b/src/suricata.c
index f3207c896b..29e715c1af 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -700,6 +700,10 @@ int main(int argc, char **argv)
     /* initialize the logging subsys */
     SCLogInitLogModule(NULL);
 
+    if (SCSetThreadName("Suricata-Main") < 0) {
+        SCLogWarning(SC_ERR_THREAD_INIT, "Unable to set thread name");
+    }
+
     RunModeRegisterRunModes();
 
     /* By default use IDS mode, but if nfq or ipfw