diff --git a/CHANGES b/CHANGES
index 77c4398fc5..c1bfe38a9d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -46,6 +46,7 @@
 	#451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
 	#467: DirectFB 1.4.1
 	#473: memstat_0.5.tar.gz has install with -D and that fails "make"
+	#497: OpenSSL RSA key generation hangs on x86_64
 
 2009.05, Released June 1st, 2009:
 
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index a0e6f7e54a..16938f47fc 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -9,16 +9,16 @@ OPENSSL_SITE:=http://www.openssl.org/source
 OPENSSL_TARGET_ARCH=generic32
 
 # Some architectures are optimized in OpenSSL
-ifeq ($(BR2_ARCH),avr32)
+ifeq ($(ARCH),avr32)
 OPENSSL_TARGET_ARCH=avr32
 endif
-ifeq ($(BR2_ARCH),ia64)
+ifeq ($(ARCH),ia64)
 OPENSSL_TARGET_ARCH=ia64
 endif
-ifeq ($(BR2_ARCH),powerpc)
+ifeq ($(ARCH),powerpc)
 OPENSSL_TARGET_ARCH=ppc
 endif
-ifeq ($(BR2_ARCH),x86_64)
+ifeq ($(ARCH),"x86_64")
 OPENSSL_TARGET_ARCH=x86_64
 endif