diff --git a/.gitignore b/.gitignore
index 27b3e1353..72569c982 100755
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@
 /testnet/local-testnet/*/local.conf
 /testnet/local-testnet/*/networks.d
 /netconf/netconf.db
+java/obj/
+java/libs/
diff --git a/java/README.md b/java/README.md
new file mode 100644
index 000000000..107356910
--- /dev/null
+++ b/java/README.md
@@ -0,0 +1,4 @@
+ZeroTier One SDK - Android JNI Wrapper
+=====
+
+To Build:  <path to Android-ndk>/ndk-build ZT1=<path to ZeroTierOne root>
diff --git a/java/jni/Android.mk b/java/jni/Android.mk
new file mode 100644
index 000000000..8bc63e7cf
--- /dev/null
+++ b/java/jni/Android.mk
@@ -0,0 +1,34 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ZeroTierOneJNI
+LOCAL_SRC_FILES := \
+	$(ZT1)/ext/lz4/lz4.c \
+	$(ZT1)/ext/json-parser/json.c \
+	$(ZT1)/ext/http-parser/http_parser.c \
+	$(ZT1)/node/C25519.cpp \
+	$(ZT1)/node/CertificateOfMembership.cpp \
+	$(ZT1)/node/Defaults.cpp \
+	$(ZT1)/node/Dictionary.cpp \
+	$(ZT1)/node/Identity.cpp \
+	$(ZT1)/node/IncomingPacket.cpp \
+	$(ZT1)/node/InetAddress.cpp \
+	$(ZT1)/node/Multicaster.cpp \
+	$(ZT1)/node/Network.cpp \
+	$(ZT1)/node/NetworkConfig.cpp \
+	$(ZT1)/node/Node.cpp \
+	$(ZT1)/node/OutboundMulticast.cpp \
+	$(ZT1)/node/Packet.cpp \
+	$(ZT1)/node/Peer.cpp \
+	$(ZT1)/node/Poly1305.cpp \
+	$(ZT1)/node/Salsa20.cpp \
+	$(ZT1)/node/SelfAwareness.cpp \
+	$(ZT1)/node/SHA512.cpp \
+	$(ZT1)/node/Switch.cpp \
+	$(ZT1)/node/Topology.cpp \
+	$(ZT1)/node/Utils.cpp \
+	$(ZT1)/osdep/Http.cpp \
+	$(ZT1)/osdep/OSUtils.cpp
+
+include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
diff --git a/java/jni/Application.mk b/java/jni/Application.mk
new file mode 100644
index 000000000..11c5c2cf8
--- /dev/null
+++ b/java/jni/Application.mk
@@ -0,0 +1,3 @@
+APP_ABI := armeabi armeabi-v7a arm64-v8a x86
+APP_STL := gnustl_static
+APP_CPPFLAGS += -fexceptions
\ No newline at end of file