diff --git a/userspace/usr/comma/adb.sh b/userspace/usr/comma/adb.sh
new file mode 100644
index 00000000..91b4ea8d
--- /dev/null
+++ b/userspace/usr/comma/adb.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+set -e
+
+PORT=5555
+
+setprop service.adb.tcp.port $PORT
+sudo systemctl start adbd
+
+IP=$(echo $SSH_CONNECTION | awk '{ print $3}')
+echo "then, connect on your computer:"
+echo "adb connect $IP:$PORT"
\ No newline at end of file
diff --git a/userspace/usr/comma/comma.sh b/userspace/usr/comma/comma.sh
index 0f8006e5..ef586d72 100755
--- a/userspace/usr/comma/comma.sh
+++ b/userspace/usr/comma/comma.sh
@@ -25,6 +25,9 @@ fi
 sudo chown comma: /data
 sudo chown comma: /data/media
 
+# run adb service
+./adb.sh
+
 handle_setup_keys () {
   # install default SSH key while still in setup
   if [[ ! -e /data/params/d/GithubSshKeys && ! -e /data/continue.sh ]]; then