diff --git a/Makefile.am_client b/Makefile.am_client
index f0caaf43..a02da324 100644
--- a/Makefile.am_client
+++ b/Makefile.am_client
@@ -35,8 +35,8 @@ if !EMBEDDED_CRYPTOPP
 urbackupclientbackend_LDADD += $(CRYPTOPP_LIBS)
 else
 urbackupclientbackend_CXXFLAGS += -DCRYPTOPP_INCLUDE_PREFIX=cryptoplugin -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562
-ifeq ($(TARGET_CPU),x86)
-urbackupsrv_CXXFLAGS += -msse -msse2
+if TARGET_CPU_IS_X64
+urbackupclientbackend_CXXFLAGS += -msse -msse2
 endif
 endif
 
diff --git a/Makefile.am_server b/Makefile.am_server
index 2f11a3e4..c4a8e342 100644
--- a/Makefile.am_server
+++ b/Makefile.am_server
@@ -45,7 +45,7 @@ if !EMBEDDED_CRYPTOPP
 urbackupsrv_LDADD += $(CRYPTOPP_LIBS)
 else
 urbackupsrv_CXXFLAGS += -DCRYPTOPP_INCLUDE_PREFIX=cryptoplugin -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS -DCRYPTOPP_NO_BACKWARDS_COMPATIBILITY_562
-ifeq ($(TARGET_CPU),x86)
+if TARGET_CPU_IS_X64
 urbackupsrv_CXXFLAGS += -msse -msse2
 endif
 endif
diff --git a/configure.ac_client b/configure.ac_client
index c48ce10b..33737eed 100644
--- a/configure.ac_client
+++ b/configure.ac_client
@@ -30,6 +30,7 @@ AM_CONDITIONAL(CLIENT_UPDATE, test "x$enable_clientupdate" = xyes)
 AC_ARG_ENABLE([embedded-cryptopp],
      AS_HELP_STRING([--enable-embedded-cryptopp], [Compile and use Crypto++ 5.6.3 included with the source distribution.]))
 AM_CONDITIONAL(EMBEDDED_CRYPTOPP, test "x$enable_embedded_cryptopp" = xyes)
+AM_CONDITIONAL(TARGET_CPU_IS_X64, test "x$TARGET_CPU" = xx86)
 
 # Checks for programs.
 AC_PROG_CXX
diff --git a/configure.ac_server b/configure.ac_server
index c30a3c78..41c2fb79 100644
--- a/configure.ac_server
+++ b/configure.ac_server
@@ -26,7 +26,7 @@ AM_CONDITIONAL(WITH_FORTIFY, test "x$enable_fortify" != xno)
 AC_ARG_ENABLE([embedded-cryptopp],
      AS_HELP_STRING([--enable-embedded-cryptopp], [Compile and use Crypto++ 5.6.3 included with the source distribution.]))
 AM_CONDITIONAL(EMBEDDED_CRYPTOPP, test "x$enable_embedded_cryptopp" = xyes)
-
+AM_CONDITIONAL(TARGET_CPU_IS_X64, test "x$TARGET_CPU" = xx86)
 
 
 # Checks for programs.