diff --git a/.travis.yml b/.travis.yml
index d5cf8ea10c..747168288e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ install:
   # These are release-related artifacts and have to be evaluated before we start doing conditional checks inside stages
   - source ".travis/tagger.sh"
   - export GIT_TAG="$(git tag --points-at)"
+  - git submodule update --init --recursive
 
 
 # Setup notification system
diff --git a/Makefile.am b/Makefile.am
index 180d337ce9..8355161bb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,37 +55,38 @@ dist_noinst_DATA = \
     cppcheck.sh \
     configs.signatures \
     contrib \
+    docs \
+    mqtt_websockets \
     netdata.cppcheck \
     netdata.spec \
     package.json \
-    docs \
-    packaging/version \
-    packaging/dashboard.version \
-    packaging/dashboard.checksums \
-    packaging/go.d.version \
-    packaging/go.d.checksums \
-    packaging/jsonc.version \
-    packaging/jsonc.checksums \
-    packaging/judy.version \
-    packaging/judy.checksums \
-    packaging/libwebsockets.version \
-    packaging/libwebsockets.checksums \
-    packaging/mosquitto.version \
-    packaging/mosquitto.checksums \
     packaging/bundle-dashboard.sh \
     packaging/bundle-ebpf.sh \
     packaging/bundle-judy.sh \
     packaging/bundle-libbpf.sh \
+    packaging/bundle-lws.sh \
     packaging/bundle-mosquitto.sh \
     packaging/check-kernel-config.sh \
-    packaging/libbpf.checksums \
-    packaging/libbpf.version \
+    packaging/dashboard.checksums \
+    packaging/dashboard.version \
     packaging/ebpf.checksums \
     packaging/ebpf.version \
-    packaging/bundle-lws.sh \
+    packaging/go.d.checksums \
+    packaging/go.d.version \
     packaging/installer/README.md \
     packaging/installer/UNINSTALL.md \
     packaging/installer/UPDATE.md \
+    packaging/jsonc.checksums \
+    packaging/jsonc.version \
+    packaging/judy.checksums \
+    packaging/judy.version \
+    packaging/libbpf.checksums \
+    packaging/libbpf.version \
+    packaging/libwebsockets.checksums \
+    packaging/libwebsockets.version \
+    packaging/mosquitto.checksums \
+    packaging/mosquitto.version \
+    packaging/version \
     $(NULL)
 
 # until integrated within build