diff --git a/debuggerd/Android.mk b/debuggerd/Android.mk
index 189bfda..e0a2d96 100644
--- a/debuggerd/Android.mk
+++ b/debuggerd/Android.mk
@@ -19,7 +19,11 @@
 	-Werror \
 	-Wno-unused-parameter \
 
-LOCAL_MODULE := debuggerd
+ifeq ($(TARGET_IS_64_BIT),true)
+    LOCAL_MODULE := debuggerd64
+else
+    LOCAL_MODULE := debuggerd
+endif
 
 ifeq ($(ARCH_ARM_HAVE_VFP),true)
 LOCAL_CFLAGS += -DWITH_VFP
diff --git a/include/cutils/debugger.h b/include/cutils/debugger.h
index 4eda523..af80e2c 100644
--- a/include/cutils/debugger.h
+++ b/include/cutils/debugger.h
@@ -23,7 +23,11 @@
 extern "C" {
 #endif
 
+#if __LP64__
+#define DEBUGGER_SOCKET_NAME "android:debuggerd64"
+#else
 #define DEBUGGER_SOCKET_NAME "android:debuggerd"
+#endif
 
 typedef enum {
     // dump a crash