diff --git src/Main/Main.make src/Main/Main.make
index 581eb34a..a4ecbf42 100755
--- src/Main/Main.make
+++ src/Main/Main.make
@@ -211,10 +211,9 @@ endif
 
 	echo -n APPLTRUE >$(APPNAME).app/Contents/PkgInfo
 	sed -e 's/_VERSION_/$(patsubst %a,%.1,$(patsubst %b,%.2,$(TC_VERSION)))/' ../Build/Resources/MacOSX/Info.plist.xml >$(APPNAME).app/Contents/Info.plist
-	codesign -s "Developer ID Application: IDRIX (Z933746L2S)" --timestamp $(APPNAME).app
 
 install: prepare
-	cp -R $(APPNAME).app /Applications/.
+	cp -R $(APPNAME).app $(DESTDIR)$(APPDIR)
 
 package: prepare
 	/usr/local/bin/packagesbuild $(PWD)/Setup/MacOSX/veracrypt.pkgproj
diff --git src/Makefile src/Makefile
index 50af3021..12c31615 100644
--- src/Makefile
+++ src/Makefile
@@ -231,6 +231,7 @@ endif
 ifeq "$(shell uname -s)" "Darwin"
 
 	PLATFORM := MacOSX
+	APPDIR := /Applications/.
 	APPNAME := VeraCrypt
 
 	export VC_OSX_TARGET ?= 10.7
@@ -276,8 +277,8 @@ ifeq "$(shell uname -s)" "Darwin"
 		S := $(C_CXX_FLAGS)
 		C_CXX_FLAGS = $(subst -MMD,,$(S))
 
-		C_CXX_FLAGS += -gfull -arch i386 -arch x86_64
-		LFLAGS += -Wl,-dead_strip -arch i386 -arch x86_64
+		C_CXX_FLAGS += -gfull @ARCH_FLAGS@
+		LFLAGS += -Wl,-dead_strip @ARCH_FLAGS@
 
 		WX_CONFIGURE_FLAGS += --enable-universal_binary=i386,x86_64
 		WXCONFIG_CFLAGS += -gfull