diff --git a/Makefile.rules b/Makefile.rules
index ae4e65247fb..f6e3467e787 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -602,6 +602,18 @@ ifdef ENABLE_PPC_JIT
   JIT_LIBS += LLVMPowerPC LLVMSelectionDAG
 endif
 
+# You can enable the Alpha JIT on a non-Alpha host by setting the flag
+# ENABLE_ALPHA_JIT on the make command line. If not, it will still be
+# enabled automagically on an PowerPC host.
+ifeq ($(ARCH), Alpha)
+  ENABLE_ALPHA_JIT = 1
+endif
+
+# What the PowerPC JIT requires
+ifdef ENABLE_ALPHA_JIT
+  JIT_LIBS += LLVMAlpha LLVMSelectionDAG
+endif
+
 LLVMLIBS := $(JIT_LIBS) LLVMScalarOpts LLVMAnalysis.a LLVMTransformUtils.a \
             LLVMBCReader LLVMCore LLVMSupport.a LLVMTarget.a LLVMbzip2 \
             LLVMSystem.a $(PLATFORMLIBDL)
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 153ddfe439d..42775d33493 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -212,7 +212,7 @@ else
     Sparc)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     PowerPC) AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     x86_64)  AC_SUBST(JIT,[[]]) ;;
-    Alpha)   AC_SUBST(JIT,[[]]) ;;
+    Alpha)   AC_SUBST(JIT,[[TARGET_HAS_JIT=1]]) ;;
     IA64)    AC_SUBST(JIT,[[]]) ;;
     *)       AC_SUBST(JIT,[[]]) ;;
   esac
diff --git a/configure b/configure
index c6b05f057ff..d93b4d81bd1 100755
--- a/configure
+++ b/configure
@@ -2997,7 +2997,7 @@ else
  ;;
     x86_64)  JIT=
  ;;
-    Alpha)   JIT=
+    Alpha)   JIT=TARGET_HAS_JIT=1
  ;;
     IA64)    JIT=
  ;;