diff --git a/Android.mk b/Android.mk
index 9271768..962bdce 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,4 +2,6 @@
 # vendor copies of the UAPI includes that are too old for us to build.
 UAPI_INCLUDES := bionic/libc/kernel/uapi
 
+NETNS_RUN_DIR ?= /mnt/run
+
 include $(call all-subdir-makefiles)
diff --git a/Makefile b/Makefile
index 6ad9610..b890758 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@
 LIBDIR?=$(PREFIX)/lib
 SBINDIR?=/sbin
 CONFDIR?=/etc/iproute2
+NETNS_RUN_DIR?=/var/run/netns
+NETNS_ETC_DIR?=/etc/netns
 DATADIR?=$(PREFIX)/share
 HDRDIR?=$(PREFIX)/include/iproute2
 DOCDIR?=$(DATADIR)/doc/iproute2
@@ -26,7 +28,9 @@
 DEFINES+= -DNO_SHARED_LIBS
 endif
 
-DEFINES+=-DCONFDIR=\"$(CONFDIR)\"
+DEFINES+=-DCONFDIR=\"$(CONFDIR)\" \
+         -DNETNS_RUN_DIR=\"$(NETNS_RUN_DIR)\" \
+         -DNETNS_ETC_DIR=\"$(NETNS_ETC_DIR)\"
 
 #options for decnet
 ADDLIB+=dnet_ntop.o dnet_pton.o
diff --git a/include/namespace.h b/include/namespace.h
index 51324b2..183f461 100644
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -7,8 +7,13 @@
 #include <sys/syscall.h>
 #include <errno.h>
 
+#ifndef NETNS_RUN_DIR
 #define NETNS_RUN_DIR "/var/run/netns"
+#endif
+
+#ifndef NETNS_ETC_DIR
 #define NETNS_ETC_DIR "/etc/netns"
+#endif
 
 #ifndef CLONE_NEWNET
 #define CLONE_NEWNET 0x40000000	/* New network namespace (lo, device, names sockets, etc) */
diff --git a/ip/Android.mk b/ip/Android.mk
index 179611f..23ffbfd 100644
--- a/ip/Android.mk
+++ b/ip/Android.mk
@@ -32,6 +32,7 @@
     -Wno-unused-parameter \
     -Werror \
     -D_GNU_SOURCE \
+    -DNETNS_RUN_DIR=\"$(NETNS_RUN_DIR)\" \
     -DHAVE_SETNS \
 
 LOCAL_LDFLAGS := -Wl,-export-dynamic -Wl,--no-gc-sections
diff --git a/lib/Android.mk b/lib/Android.mk
index 424b7fd..e1bd3fe 100644
--- a/lib/Android.mk
+++ b/lib/Android.mk
@@ -11,6 +11,7 @@
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include $(UAPI_INCLUDES)
 LOCAL_CFLAGS := -O2 -g -W -Wall \
 	-DCONFDIR=\"/data/misc/net\" \
+	-DNETNS_RUN_DIR=\"$(NETNS_RUN_DIR)\" \
 	-DHAVE_UNISTD_H \
 	-DHAVE_ERRNO_H \
 	-DHAVE_NETINET_IN_H \