diff --git a/ChangeLog b/ChangeLog
index 338bc3bf4..421a5bfc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-19  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* configure.ac:
+	* hw/xfree86/os-support/bus/Makefile.am: 
+	* hw/xfree86/os-support/linux/Makefile.am:
+	Linux/Alpha support (Stefaan De Roeck)
+
 2005-09-14  Eric Anholt  <anholt@FreeBSD.org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 7fcd148b5..9820f95b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -697,6 +697,10 @@ if test "x$XORG" = xyes; then
 		  ia64*)
 			linux_ia64=yes
 			;;
+		  alpha*)
+		  	linux_alpha=yes
+			XORG_OS_PCI="axp"
+			;;
 		  *)
 			;;
 		esac
@@ -848,6 +852,7 @@ AM_CONDITIONAL([XORG_BUS_IX86PCI], [test "x$xorg_bus_ix86pci" = xyes])
 AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
 AM_CONDITIONAL([XORG_LOADER_SPARC], [test "x$xorg_loader_sparcmuldiv" = xyes])
 AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
+AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
 AM_CONDITIONAL([SOLARIS_USL_CONSOLE], [test "x$solaris_usl_console" = xyes])
 AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
 AM_CONDITIONAL(MFB, [test "x$XORG" = xyes])
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
index 15af31c53..52dc33d35 100644
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -26,7 +26,7 @@ AM_CFLAGS = $(XORG_CFLAGS)
 # hack to keep all the OS PCI support files in the distball even though
 # there aren't rules to build them all yet.  also the AC_SUBST pattern
 # above will defeat automake's EXTRA_DIST logic, woo.
-PCIDISTSOURCES = freebsdPci.c linuxPci.c netbsdPci.c sparcPci.c
+PCIDISTSOURCES = axpPci.c freebsdPci.c linuxPci.c netbsdPci.c sparcPci.c
 
 EXTRA_DIST = \
 	460gxPCI.h \
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 678b7b68b..18f30353c 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -3,6 +3,11 @@ noinst_LTLIBRARIES = liblinux.la
 if LINUX_IA64
 PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
 endif
+if LINUX_ALPHA
+PLATFORM_PCI_SUPPORT = lnx_ev56.c
+       $(srcdir)/lnx_axp.c
+       $(srcdir)/../shared/xf86Axp.c
+endif
 
 liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
                      lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \
@@ -27,3 +32,4 @@ EXTRA_DIST = \
 	lnx.h \
 	lnx_kbd.h \
         $(srcdir)/../shared/ia64Pci.h
+       $(srcdir)/../shared/xf86Axp.h