diff --git a/src/tap/Makefile b/src/tap/Makefile
index d4d1158..f47d1bb 100644
--- a/src/tap/Makefile
+++ b/src/tap/Makefile
@@ -14,18 +14,18 @@ BUNDLE_NAME = tap.kext
 TAP_KEXT_VERSION = $(TUNTAP_VERSION)
 
 BUNDLE_REGION = English
-BUNDLE_IDENTIFIER = foo.tap
+BUNDLE_IDENTIFIER = net.sf.tuntaposx.tap
 BUNDLE_SIGNATURE = ????
 BUNDLE_PACKAGETYPE = KEXT
 BUNDLE_VERSION = $(TAP_KEXT_VERSION)
 
 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
 CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
-	-fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
+	-fno-builtin -fno-stack-protector -arch x86_64 \
 	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
 	-DTAP_KEXT_VERSION=\"$(TAP_KEXT_VERSION)\"
 CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext
+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch x86_64 -Xlinker -kext
 
 CCP = g++
 CC = gcc
diff --git a/src/tun/Makefile b/src/tun/Makefile
index 9ca6794..f7c5465 100644
--- a/src/tun/Makefile
+++ b/src/tun/Makefile
@@ -15,18 +15,18 @@ BUNDLE_NAME = tun.kext
 TUN_KEXT_VERSION = $(TUNTAP_VERSION)
 
 BUNDLE_REGION = English
-BUNDLE_IDENTIFIER = foo.tun
+BUNDLE_IDENTIFIER = net.sf.tuntaposx.tun
 BUNDLE_SIGNATURE = ????
 BUNDLE_PACKAGETYPE = KEXT
 BUNDLE_VERSION = $(TUN_KEXT_VERSION)
 
 INCLUDE = -I.. -I/System/Library/Frameworks/Kernel.framework/Headers
 CFLAGS = -Wall -mkernel -force_cpusubtype_ALL \
-	-fno-builtin -fno-stack-protector -arch i386 -arch x86_64 \
+	-fno-builtin -fno-stack-protector -arch x86_64 \
 	-DKERNEL -D__APPLE__ -DKERNEL_PRIVATE -DTUNTAP_VERSION=\"$(TUNTAP_VERSION)\" \
 	-DTUN_KEXT_VERSION=\"$(TUN_KEXT_VERSION)\"
 CCFLAGS = $(CFLAGS)
-LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch i386 -arch x86_64 -Xlinker -kext
+LDFLAGS = -Wall -mkernel -nostdlib -r -lcc_kext -arch x86_64 -Xlinker -kext
 
 CCP = g++
 CC = gcc