diff --git a/CHANGELOG b/CHANGELOG
index 197280741..0912b17f2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@ o New UDP payloads:
   + [GH#1279] TS3INIT1 for UDP 3389 [colcrunch]
   + [GH#1895] DTLS for UDP 3391 (RD Gateway) [Arnim Rupp]
 
+o [Ncat][GH#2154] Ncat no longer crashes when used with Unix domain sockets.
+
 o [NSE] Script mysql-audit now defaults to the bundled mysql-cis.audit for
   the audit rule base. [nnposter]
 
diff --git a/ncat/ncat_main.c b/ncat/ncat_main.c
index 8942d83cb..2792a6ac2 100644
--- a/ncat/ncat_main.c
+++ b/ncat/ncat_main.c
@@ -846,7 +846,7 @@ int main(int argc, char *argv[])
             targetaddrs->addr.un.sun_family = AF_UNIX;
             strncpy(targetaddrs->addr.un.sun_path, argv[optind], sizeof(targetaddrs->addr.un.sun_path));
             targetaddrs->addrlen = SUN_LEN(&targetaddrs->addr.un);
-            o.target = argv[optind];
+            o.sslservername = o.target = argv[optind];
             optind++;
         } else
 #endif
@@ -865,7 +865,7 @@ int main(int argc, char *argv[])
                 targetaddrs->addr.vm.svm_cid = long_cid;
 
                 targetaddrs->addrlen = sizeof(targetaddrs->addr.vm);
-                o.target = argv[optind];
+                o.sslservername = o.target = argv[optind];
                 optind++;
             }
         } else