diff --git a/distrib/notes/README.alpha b/distrib/notes/README.alpha
index b1d847f83..0d48ae634 100644
--- a/distrib/notes/README.alpha
+++ b/distrib/notes/README.alpha
@@ -1,28 +1,8 @@
 Post-installation instructions for X.Org on OpenBSD/alpha
 ---------------------------------------------------------
 
-OpenBSD uses the X.Org X server on alpha. 
-
-Currently, only TGA video cards are supported.
-
-The wsfb driver supports the TGA as a dumb framebuffer at 8 or 24 bits
-per pixel, depending on the card model. 
-A default /etc/X11/xorg.conf is installed that uses this driver. So
-you can just use 'startx' or xdm to start X without further
-configuration. 
-
-See the tga(4) manual page for instructions on setting
-the resolution of a TGA card.
-
-Start either xdm(1) or startx(1).
-
-   a. Start xdm(1), the X display manager by activating the xdm_flags option
-      in /etc/rc.conf(8) or /etc/rc.conf.local(8).  You need to disable
-      the getty process attached to /dev/ttyC0 if your video card is a TGA.
-
-   b. Start startx(1) from a console shell.  It is the X script that starts
-      the X server and a few X applications, including a window manager.
+There is no X server for alpha.  Only userland X.
 
 problem_blurb
 
-$OpenBSD: README.alpha,v 1.3 2010/08/05 06:34:19 matthieu Exp $
+$OpenBSD: README.alpha,v 1.4 2011/02/19 19:51:53 matthieu Exp $
diff --git a/driver/Makefile b/driver/Makefile
index ebc802cab..84d7774af 100644
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2011/01/02 14:04:18 matthieu Exp $
+# $OpenBSD: Makefile,v 1.36 2011/02/19 19:51:53 matthieu Exp $
 
 INPUT_DRV_DEFAULT= \
 	xf86-input-keyboard \
@@ -14,7 +14,7 @@ INPUT_DRV_COMMON= \
 	xf86-input-hyperpen xf86-input-joystick \
 	xf86-input-mutouch xf86-input-penmount
 
-INPUT_DRV_alpha= ${INPUT_DRV_COMMON}
+INPUT_DRV_alpha=
 
 INPUT_DRV_amd64= ${INPUT_DRV_COMMON} xf86-input-vmmouse
 
@@ -54,9 +54,7 @@ VIDEO_DRV_COMMON= \
 	xf86-video-sis xf86-video-tdfx xf86-video-trident \
 	xf86-video-tseng xf86-video-vesa
 
-VIDEO_DRV_alpha= \
-	${VIDEO_DRV_COMMON} \
-	xf86-video-wsfb
+VIDEO_DRV_alpha=
 
 VIDEO_DRV_amd64= \
 	${VIDEO_DRV_COMMON} \
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper
index 566bb34bf..f393e3257 100644
--- a/xserver/Makefile.bsd-wrapper
+++ b/xserver/Makefile.bsd-wrapper
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.32 2011/01/02 14:23:40 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.33 2011/02/19 19:51:53 matthieu Exp $
 
 .include <bsd.xconf.mk>
 
 DIST= ${.CURDIR}
 
 # Machines for which we don't build the Xorg Xserver
-NO_XORG_MACHINES=	aviion hppa64 landisk \
+NO_XORG_MACHINES=	alpha aviion hppa64 landisk \
 			mvme68k mvme88k mvmeppc solbourne vax
 
 NO_XF86UTIL_MACHINES=	hp300 landisk mac68k sgi sparc vax
@@ -32,9 +32,9 @@ DRI_OPTION=	--disable-dri --disable-dri2
 .endif
 
 CONFIGURE_ARGS=	--localstatedir=/var --sysconfdir=/etc/X11 \
-		--with-xkb-path=/etc/X11/xkb \
+		--with-xkb-path=${X11BASE}/share/X11/xkb \
 		--with-xkb-output=/var/db/xkb \
-		--with-default-xkb-rules=xorg \
+		--with-default-xkb-rules=base \
 		--with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \
 		--enable-install-setuid --enable-privsep \
 		--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \