diff --git a/Makefile.am b/Makefile.am
index ef21831..165097b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,17 @@
 
 CLEANFILES = *~
 
-sysconf_DATA = key_file ipmi_pass
+sysconf_DATA = key_file ipmi_pass_32 ipmi_pass_64
+
+FILE_32 := ipmi_pass_32
+FILE_64 := ipmi_pass_64
+
+CP_FILE := $(FILE_$(TARGET_OS_ARCH))
+
 install-exec-hook:
+	cp $(DESTDIR)$(sysconfdir)/$(CP_FILE) $(DESTDIR)$(sysconfdir)/ipmi_pass
+	rm $(DESTDIR)$(sysconfdir)/ipmi_pass_64
+	rm $(DESTDIR)$(sysconfdir)/ipmi_pass_32
 	chmod 0600 $(DESTDIR)$(sysconfdir)/key_file
 	chmod 0600 $(DESTDIR)$(sysconfdir)/ipmi_pass
 
diff --git a/configure.ac b/configure.ac
index 24bb490..668f744 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,6 +9,7 @@
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+AC_SUBST([TARGET_OS_ARCH])
 
 # Checks for programs
 AM_PROG_AR
@@ -16,6 +17,19 @@
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+# Checks for arch
+AC_CANONICAL_TARGET
+TARGET_OS_ARCH=""
+AS_CASE([$target_cpu],
+        [x86_64|aarch64*|mips64*|ppc64*|sparc64],
+        [
+            TARGET_OS_ARCH="64"
+        ],
+        [i?86|arm*|mips*|ppc*|sparc],
+        [
+            TARGET_OS_ARCH="32"
+        ])
+
 AX_CHECK_OPENSSL([], [AC_MSG_ERROR(["openssl required and not found"])])
 AC_CHECK_LIB([pam], [pam_start], [], [AC_MSG_ERROR([libpam not found])])
 
diff --git a/ipmi_pass b/ipmi_pass_32
similarity index 100%
rename from ipmi_pass
rename to ipmi_pass_32
Binary files differ
diff --git a/ipmi_pass_64 b/ipmi_pass_64
new file mode 100644
index 0000000..5c6a217
--- /dev/null
+++ b/ipmi_pass_64
Binary files differ