diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e26aed3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+hdhomerun_config
+libhdhomerun.dylib
diff --git a/Makefile b/Makefile
index 20dc096..1bda968 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,11 @@ else
     LDFLAGS += -lsocket
   endif
   ifeq ($(OS),Darwin)
-    CFLAGS += -arch i386 -arch x86_64
+    ifeq ($(shell uname -m),x86_64)
+      CFLAGS += -arch x86_64
+    else
+      CFLAGS += -arch i386
+    endif
     LIBEXT := .dylib
     SHARED := -dynamiclib -install_name libhdhomerun$(LIBEXT)
   endif