diff --git a/.gitmodules b/.gitmodules
index de5224d6ea72..e504c69f29d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,4 +20,6 @@
 	url = ../scylla-python3
 [submodule "tools/cqlsh"]
 	path = tools/cqlsh
-	url = ../scylla-cqlsh
+	url = git@github.com:fruch/scylla-cqlsh.git
+        branch = patch_so_files
+
diff --git a/tools/cqlsh b/tools/cqlsh
index 73bdbeb03648..deffe4f50702 160000
--- a/tools/cqlsh
+++ b/tools/cqlsh
@@ -1 +1 @@
-Subproject commit 73bdbeb03648efe857b54c5e7459b5e71cd69fd4
+Subproject commit deffe4f507026f67c7265d202c313f966900d5f9