diff --git a/system/adb/Makefile b/system/adb/Makefile
index f13fff938..98d43e6d9 100644
--- a/system/adb/Makefile
+++ b/system/adb/Makefile
@@ -20,21 +20,19 @@
 
 include $(APPDIR)/Make.defs
 
-ADB_DIR := $(APPDIR)/system/adb
-CONFIG_ADBD_URL ?= "https://github.com/spiriou/microADB.git"
-CONFIG_ADBD_VERSION ?= b7025c67b866925d1e64c016a844a6a3392557a4
+ADBD_URL ?= "https://github.com/spiriou/microADB/archive"
+ADBD_VERSION ?= a1a12e2452eed9d8fdd008c05b4d93c992bfc0a7
 
+ADB_DIR := $(APPDIR)/system/adb
 ADB_UNPACKNAME := microADB
 ADB_UNPACKDIR := $(ADB_DIR)/$(ADB_UNPACKNAME)
 
 $(ADB_UNPACKDIR):
 	@echo "Downloading: $(ADB_UNPACKNAME)"
-	$(call DELDIR, "$@")
-	$(Q) mkdir "$@"
-	$(Q) cd "$@" && git init && \
-	git remote add origin "$(CONFIG_ADBD_URL)" && \
-	git fetch origin $(CONFIG_ADBD_VERSION) --depth=1 && \
-	git reset --hard FETCH_HEAD
+	$(Q) curl -O -L $(ADBD_URL)/$(ADBD_VERSION).zip
+	$(Q) unzip -o $(ADBD_VERSION).zip
+	$(call DELFILE, $(ADBD_VERSION).zip)
+	$(call MOVEFILE, $(ADB_UNPACKNAME)-$(ADBD_VERSION), $(ADB_UNPACKDIR))
 
 # adb server app
 
diff --git a/system/adb/logcat_service.c b/system/adb/logcat_service.c
index ba6bc7faa..677170705 100644
--- a/system/adb/logcat_service.c
+++ b/system/adb/logcat_service.c
@@ -105,7 +105,7 @@ static const adb_service_ops_t logcat_ops =
   .on_write_frame = alog_on_write,
   .on_ack_frame   = alog_on_ack,
   .on_kick        = alog_on_kick,
-  .close          = alog_close
+  .on_close       = alog_close
 };
 
 static void logcat_on_data_available(uv_poll_t * handle,