diff --git a/x11/Xserver/Xserver/Makefile b/x11/Xserver/Xserver/Makefile
index 342a9fd9e967..c9dc077265f3 100644
--- a/x11/Xserver/Xserver/Makefile
+++ b/x11/Xserver/Xserver/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2004/01/10 04:34:33 fredb Exp $
+#	$NetBSD: Makefile,v 1.10 2004/01/17 04:03:26 rtr Exp $
 
 .include <bsd.own.mk>
 
@@ -30,6 +30,10 @@ SUBDIR+=	XFree86
 SUBDIR+=	Xmac68k
 .endif
 
+.if ${XSERVER_XAMIGA} == "yes"
+SUBDIR+=	Xamiga
+.endif
+
 .include "Makefile.Xserver"
 
 .include <bsd.subdir.mk>
diff --git a/x11/Xserver/Xserver/Makefile.Xserver b/x11/Xserver/Xserver/Makefile.Xserver
index b2bf2489b363..3b6d147e4f84 100644
--- a/x11/Xserver/Xserver/Makefile.Xserver
+++ b/x11/Xserver/Xserver/Makefile.Xserver
@@ -1,16 +1,17 @@
-#	$NetBSD: Makefile.Xserver,v 1.11 2004/01/10 04:34:33 fredb Exp $
+#	$NetBSD: Makefile.Xserver,v 1.12 2004/01/17 04:03:26 rtr Exp $
 
 .PATH:		${NETBSDSRCDIR}/x11/Xserver/Xserver
 
 .for _SL in	dix os mi printer printer/pcl printer/ps printer/raster \
 		Xext/ext Xext/exts GL/glx GL/GLcore xkb xinput lbx dbe \
 		record randr render xtrap mfb cfb cfb16 cfb24 cfb32 fb \
-		hw/xnest hw/vfb fontbase \
+		hw/xnest hw/vfb fontbase afb \
 		\
 		dix/xpstubs hw/sun hw/xfree86/xf86 hw/xfree86/xf86_os \
 		hw/xfree86/xf86config hw/xfree86/loader \
 		\
-		hw/netbsd/macppc hw/netbsd/hpc hw/netbsd/x68k hw/netbsd/mac68k
+		hw/netbsd/macppc hw/netbsd/hpc hw/netbsd/x68k \
+		hw/netbsd/mac68k hw/netbsd/amiga
 
 .if !defined(LIBDIR.${_SL})
 LIBDIR.${_SL}!=	cd ${NETBSDSRCDIR}/x11/Xserver/${_SL} && ${PRINTOBJDIR}
diff --git a/x11/Xserver/Xserver/Xamiga/Makefile b/x11/Xserver/Xserver/Xamiga/Makefile
new file mode 100644
index 000000000000..d0df4e284ca0
--- /dev/null
+++ b/x11/Xserver/Xserver/Xamiga/Makefile
@@ -0,0 +1,25 @@
+#	$NetBSD: Makefile,v 1.1 2004/01/17 04:03:26 rtr Exp $
+
+.include <bsd.own.mk>
+
+PROG=	Xamiga
+
+MAN=	Xamiga.1
+MLINKS=	Xamiga.1 Xamiga24.1
+
+.PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/netbsd/amiga
+
+.include "../Makefile.Xserver"
+
+LDADD=	${LDADD.dix} ${LDADD.hw/netbsd/amiga} ${LDADD.afb} -lXfont \
+	-lfreetype ${LDADD.os} ${LDADD.cfb} ${LDADD.cfb16} ${LDADD.cfb24} \
+	${LDADD.cfb32} ${LDADD.mfb} ${LDADD.xkb} ${LDADD.mi} \
+	${LDADD.Xext/ext} ${LDADD.xinput} ${LDADD.lbx} -llbxutil \
+	${LDADD.randr} ${LDADD.render} ${LDADD.dix/xpstubs} \
+	${LDADD.dbe} ${LDADD.record} ${LDADD.GL/glx} ${LDADD.GL/GLcore} \
+	-lXau -lXdmcp -lz -lm
+
+SYMLINKS=	${X11BINDIR}/Xamiga ${X11BINDIR}/X
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff --git a/x11/Xserver/Xserver/Xamiga/Xamiga.c b/x11/Xserver/Xserver/Xamiga/Xamiga.c
new file mode 100644
index 000000000000..30b15e0f6bf3
--- /dev/null
+++ b/x11/Xserver/Xserver/Xamiga/Xamiga.c
@@ -0,0 +1 @@
+/*	$NetBSD: Xamiga.c,v 1.1 2004/01/17 04:03:26 rtr Exp $	*/