diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..02b9bee
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,6 @@
+#Avoid building ebtables for emulator
+ifeq ($(call is-vendor-board-platform,QCOM),true)
+    include $(call all-subdir-makefiles)
+else
+    $(info "ebtables is disabled on this build")
+endif
diff --git a/include/ebtables_u.h b/include/ebtables_u.h
index ab615c1..07dae8e 100644
--- a/include/ebtables_u.h
+++ b/include/ebtables_u.h
@@ -24,7 +24,14 @@
 #ifndef EBTABLES_U_H
 #define EBTABLES_U_H
 #include <netinet/in.h>
+
+#ifdef __ANDROID_API__
+#pragma message "Found __ANDRIOD_API__, #undef __unused"
+#undef __unused
+#include <ebtables.h>
+#else
 #include <linux/netfilter_bridge/ebtables.h>
+#endif
 #include <linux/netfilter/x_tables.h>
 
 #ifndef IPPROTO_SCTP
diff --git a/include/ethernetdb.h b/include/ethernetdb.h
index 46d8bfd..22b6f7f 100644
--- a/include/ethernetdb.h
+++ b/include/ethernetdb.h
@@ -30,6 +30,8 @@
 #define	_PATH_ETHERTYPES	"/etc/ethertypes"
 #endif				/* _PATH_ETHERTYPES */
 
+#define __THROW
+
 struct ethertypeent {
 	char *e_name;		/* Official ethernet type name.  */
 	char **e_aliases;	/* Alias list.  */
diff --git a/userspace/Android.mk b/userspace/Android.mk
new file mode 100644
index 0000000..5053e7d
--- /dev/null
+++ b/userspace/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
diff --git a/userspace/ebtables2/Android.mk b/userspace/ebtables2/Android.mk
new file mode 100644
index 0000000..59b07b3
--- /dev/null
+++ b/userspace/ebtables2/Android.mk
@@ -0,0 +1,141 @@
+# BUILD libebtc.so
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := getethertype.c
+LOCAL_SRC_FILES += communication.c
+LOCAL_SRC_FILES += libebtc.c
+LOCAL_SRC_FILES += useful_functions.c
+LOCAL_SRC_FILES += ebtables.c
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
+LOCAL_CFLAGS += -DPROGNAME=\"ebtables\" \
+        -DPROGVERSION=\"2.0.10\" \
+        -DPROGDATE=\"December\ 2011\" \
+        -D__THROW=
+
+LOCAL_CFLAGS += -O2 -g -Wno-ignored-qualifiers
+LOCAL_CFLAGS += -Wno-sign-compare \
+                -Wno-missing-field-initializers \
+                -Wno-pointer-arith
+
+LOCAL_MODULE := libebtc
+
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
+
+# sources and intermediate files are separated
+
+c_includes := $(LOCAL_PATH)/include
+c_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+local_additional_dependencies := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
+cflags := -O2 -g \
+        -DPROGNAME=\"ebtables\" \
+        -DPROGVERSION=\"2.0.10\" \
+        -DPROGDATE=\"December\ 2011\" \
+        -Wno-sign-compare -Wno-missing-field-initializers \
+        -Wno-ignored-qualifiers
+
+extensions_src_files := \
+        extensions/ebt_802_3.c \
+        extensions/ebt_among.c \
+        extensions/ebt_arp.c \
+        extensions/ebt_arpreply.c \
+        extensions/ebt_ip.c \
+        extensions/ebt_ip6.c \
+        extensions/ebt_limit.c \
+        extensions/ebt_log.c \
+        extensions/ebt_mark.c \
+        extensions/ebt_mark_m.c \
+        extensions/ebt_nat.c \
+        extensions/ebt_nflog.c \
+        extensions/ebt_pkttype.c \
+        extensions/ebt_redirect.c \
+        extensions/ebt_standard.c \
+        extensions/ebt_stp.c \
+        extensions/ebt_ulog.c \
+        extensions/ebt_vlan.c \
+        extensions/ebtable_broute.c \
+        extensions/ebtable_filter.c \
+        extensions/ebtable_nat.c
+
+ld_flags := -nostartfiles
+shared_libs := libebtc
+module_tags := eng
+
+$(foreach file,$(extensions_src_files), \
+    $(eval include $(CLEAR_VARS)) \
+    $(eval LOCAL_C_INCLUDES := $(c_includes)) \
+    $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies)) \
+    $(eval LOCAL_SRC_FILES := $(file)) \
+    $(eval tmp_file := $(notdir $(file:%.c=%))) \
+    $(eval tmp_file := $(addprefix lib, $(tmp_file))) \
+    $(eval LOCAL_MODULE := $(tmp_file)) \
+    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
+    $(eval LOCAL_LDFLAGS := $(ld_flags)) \
+    $(eval LOCAL_CFLAGS := $(cflags)) \
+    $(eval LOCAL_SHARED_LIBRARIES := $(shared_libs)) \
+    $(eval include $(BUILD_SHARED_LIBRARY)) \
+)
+
+
+###############################
+include $(CLEAR_VARS)
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
+LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+
+LOCAL_CFLAGS += -DPROGNAME=\"ebtables\" \
+        -DPROGVERSION=\"2.0.10\" \
+        -DPROGDATE=\"December\ 2011\"
+
+LOCAL_SRC_FILES := ebtables-standalone.c
+
+LOCAL_SHARED_LIBRARIES += \
+        libebtc \
+        libebt_802_3 \
+        libebt_among \
+        libebt_arp \
+        libebt_arpreply \
+        libebt_ip \
+        libebt_ip6 \
+        libebt_limit \
+        libebt_log \
+        libebt_mark \
+        libebt_mark_m \
+        libebt_nat \
+        libebt_nflog \
+        libebt_pkttype \
+        libebt_redirect \
+        libebt_standard \
+        libebt_stp \
+        libebt_ulog \
+        libebt_vlan \
+        libebtable_broute \
+        libebtable_filter \
+        libebtable_nat
+
+LOCAL_MODULE := ebtables
+
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
+
+
+#######dss_test_104##########
+include $(CLEAR_VARS)
+LOCAL_MODULE:= ethertypes
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_SRC_FILES := ethertypes
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)
+include $(BUILD_PREBUILT)
+