diff --git a/Makefile b/Makefile
index 60e3ec1978a521570c40d885be1041e6958e3497..9249c7fea98b889a93f3063fbe597b96eaa4aaed 100644
--- a/Makefile
+++ b/Makefile
@@ -151,6 +151,7 @@ tarbin:
         $(bindir)/qemu-ppc \
         $(bindir)/qemu-mips \
         $(bindir)/qemu-mipsel \
+        $(bindir)/qemu-alpha \
         $(bindir)/qemu-img \
 	$(datadir)/bios.bin \
 	$(datadir)/vgabios.bin \
diff --git a/Makefile.target b/Makefile.target
index 323961a73a5505e3ae3eb5ee9a0d76699c352e42..27429918503bc408b2e639f46c0c6357416ea9e8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -304,6 +304,10 @@ ifeq ($(TARGET_BASE_ARCH), m68k)
 LIBOBJS+= helper.o
 endif
 
+ifeq ($(TARGET_BASE_ARCH), alpha)
+LIBOBJS+= op_helper.o helper.o alpha_palcode.o
+endif
+
 # NOTE: the disassembler code is only needed for debugging
 LIBOBJS+=disas.o 
 ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386)
@@ -605,6 +609,11 @@ sh7750_regnames.o: sh7750_regnames.c sh7750_regnames.h sh7750_regs.h
 tc58128.o: tc58128.c
 endif
 
+ifeq ($(TARGET_BASE_ARCH), alpha)
+op.o: op.c op_template.h op_mem.h
+op_helper.o: op_helper_mem.h
+endif
+
 $(OBJS) $(LIBOBJS) $(VL_OBJS): config.h ../config-host.h
 
 %.o: %.c
diff --git a/configure b/configure
index a7761ca2813c2af8771bdbd2a94a8d2a0f633665..f8879dfc2003bf7144028554f4377fa6afab97e7 100755
--- a/configure
+++ b/configure
@@ -437,7 +437,7 @@ if test -z "$target_list" ; then
     fi
 # the following are Linux specific
     if [ "$linux_user" = "yes" ] ; then
-        target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user ppc-linux-user mips-linux-user mipsel-linux-user m68k-linux-user $target_list"
+        target_list="i386-linux-user arm-linux-user armeb-linux-user sparc-linux-user ppc-linux-user mips-linux-user mipsel-linux-user m68k-linux-user alpha-linux-user $target_list"
     fi
 # the following are Darwin specific
     if [ "$darwin_user" = "yes" ] ; then
@@ -943,6 +943,10 @@ elif test "$target_cpu" = "m68k" ; then
   echo "#define TARGET_ARCH \"m68k\"" >> $config_h
   echo "#define TARGET_M68K 1" >> $config_h
   bflt="yes"
+elif test "$target_cpu" = "alpha" ; then
+  echo "TARGET_ARCH=alpha" >> $config_mak
+  echo "#define TARGET_ARCH \"alpha\"" >> $config_h
+  echo "#define TARGET_ALPHA 1" >> $config_h
 else
   echo "Unsupported target CPU"
   exit 1