diff --git a/.gitignore b/.gitignore
index b25c15b8..d91f820c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *~
+tags
diff --git a/adb/.gitignore b/adb/.gitignore
new file mode 100644
index 00000000..3829b510
--- /dev/null
+++ b/adb/.gitignore
@@ -0,0 +1,3 @@
+*.o
+adbd
+*.swp
diff --git a/adb/Makefile b/adb/Makefile
new file mode 100644
index 00000000..44afd9f4
--- /dev/null
+++ b/adb/Makefile
@@ -0,0 +1,60 @@
+# adbd
+
+SRCS+=adb.c
+SRCS+=fdevent.c
+SRCS+=transport.c
+SRCS+=transport_local.c
+SRCS+=transport_usb.c
+SRCS+=sockets.c
+SRCS+=services.c
+SRCS+=file_sync_service.c
+SRCS+=jdwp_service.c
+SRCS+=framebuffer_service.c
+SRCS+=remount_service.c
+SRCS+=usb_linux_client.c
+SRCS+=log_service.c
+SRCS+=utils.c
+
+VPATH+= ../libcutils
+SRCS+= array.c
+SRCS+= hashmap.c
+SRCS+= properties.c
+SRCS+= threads.c
+SRCS+= socket_inaddr_any_server.c
+SRCS+= socket_local_client.c
+SRCS+= socket_local_server.c
+SRCS+= socket_loopback_client.c
+SRCS+= socket_loopback_server.c
+SRCS+= socket_network_client.c
+SRCS+= load_file.c
+
+CPPFLAGS+= -DADB_HOST=0
+CPPFLAGS+= -DHAVE_PTHREADS
+CPPFLAGS+= -D_XOPEN_SOURCE -D_GNU_SOURCE
+CPPFLAGS+= -fPIC
+CPPFLAGS+= -I .
+CPPFLAGS+= -I ../include
+CPPFLAGS+= -I ../zlib
+CPPFLAGS+= -I $(OPENSSL_DIR)/include
+
+CPPFLAGS+= -L $(OPENSSL_DIR)
+
+CFLAGS+= -O2 -g -Wall -Wno-unused-parameter
+LDFLAGS= -static
+
+LIBS= -lrt -lpthread -lcrypto -ldl -L $(OPENSSL_DIR)
+ 
+CC=$(TOOLCHAIN)gcc
+LD=$(TOOLCHAIN)gcc
+STRIP=$(TOOLCHAIN)strip
+
+OBJS= $(SRCS:.c=.o)
+ 
+all: adbd
+ 
+adbd: $(OBJS)
+	$(LD) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+	$(STRIP) adbd
+ 
+clean:
+	rm -rf $(OBJS)
diff --git a/adb/README b/adb/README
new file mode 100644
index 00000000..dc04207f
--- /dev/null
+++ b/adb/README
@@ -0,0 +1,19 @@
+adbd for non-Android devices
+----------------------------
+
+To build adbd you need to specify your toolchain and openssl path to build adbd
+
+	export TOOLCHAIN=<your_toolchain_path_with_prefix>
+	export OPENSSL_DIR=<path_to_openssl>
+	make
+
+Thanks to:
+
+- https://hev.cc/2227.html
+- http://android.serverbox.ch/?p=1217
+- http://events.linuxfoundation.org/images/stories/pdf/lf_abs12_kobayashi.pdf
+
+Contact
+-------
+
+Yoann Sculo <yoann@sculo.fr>