--- Cryptlib/Makefile.orig	2015-06-30 18:20:12 UTC
+++ Cryptlib/Makefile
@@ -1,3 +1,9 @@
+ifeq ($(ARCH),amd64)
+	override ARCH	= x86_64
+endif
+ifeq ($(ARCH),i386)
+	override ARCH   = ia32
+endif
 
 EFI_INCLUDES	= -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol