diff --git a/x11/xdmchoose/Makefile b/x11/xdmchoose/Makefile
index 9c6c9a2ccbe..0ba86d6e31e 100644
--- a/x11/xdmchoose/Makefile
+++ b/x11/xdmchoose/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2002/12/29 20:31:41 fgsch Exp $
+# $OpenBSD: Makefile,v 1.4 2003/05/12 20:11:28 naddy Exp $
 
 COMMENT=	"alternative xdm-invoked chooser"
 
-DISTNAME=	xdmchoose-1.1.2
+DISTNAME=	xdmchoose-1.2.1
 CATEGORIES=	x11
 HOMEPAGE=	http://frmb.home.cern.ch/frmb/xdmchoose.html
 
 MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -17,9 +18,10 @@ MASTER_SITES=	http://frmb.home.cern.ch/frmb/download/
 
 USE_X11=	Yes
 CONFIGURE_STYLE= gnu
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
 
 post-install:
-	@perl -i -pe 's!%%PREFIX%%!${PREFIX}!g' ${WRKSRC}/xdmchoose.conf
+	@perl -i -pe 's!%%PREFIX%%!${TRUEPREFIX}!g' ${WRKSRC}/xdmchoose.conf
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xdmchoose
 	${INSTALL_DATA} ${WRKSRC}/xdmchoose.conf \
 		${PREFIX}/share/examples/xdmchoose/
diff --git a/x11/xdmchoose/distinfo b/x11/xdmchoose/distinfo
index 7c9f3b2315e..5cb9b876688 100644
--- a/x11/xdmchoose/distinfo
+++ b/x11/xdmchoose/distinfo
@@ -1,3 +1,3 @@
-MD5 (xdmchoose-1.1.2.tar.gz) = 5187b420babebdeecb5bfbef28b5b272
-RMD160 (xdmchoose-1.1.2.tar.gz) = 828b9e9fe56e87e19fc9f7f11737083c767670d0
-SHA1 (xdmchoose-1.1.2.tar.gz) = 375616addff91853d7a20bb9f9d23b8f9ce7b3b8
+MD5 (xdmchoose-1.2.1.tar.gz) = cd2997f62aa976cda7cc7b6f9267e650
+RMD160 (xdmchoose-1.2.1.tar.gz) = 83d5dd5583f3852f911782a5031c381ed5dea0a4
+SHA1 (xdmchoose-1.2.1.tar.gz) = 46df8b648fe7de54ea5deb15f176ba90681e5431
diff --git a/x11/xdmchoose/patches/patch-xdmchoose_conf b/x11/xdmchoose/patches/patch-xdmchoose_conf
index 2bbc8301563..9d1ab021d1c 100644
--- a/x11/xdmchoose/patches/patch-xdmchoose_conf
+++ b/x11/xdmchoose/patches/patch-xdmchoose_conf
@@ -1,16 +1,7 @@
-$OpenBSD: patch-xdmchoose_conf,v 1.1.1.1 2001/02/18 16:27:28 naddy Exp $
---- xdmchoose.conf.orig	Fri Jan 19 02:28:40 2001
-+++ xdmchoose.conf	Thu Jan 25 02:34:39 2001
-@@ -15,7 +15,7 @@ app.allowbroadcast	0
- 
- # Uncomment the line below to specify a script executed when the chooser starts
- 
--# app.startscript		"/etc/xdmchooser-script"
-+# app.startscript	"/etc/xdmchooser-script"
- # app.startscriptkill	"Xdialog"
- app.extratext		1
- app.allowctrlc		1
-@@ -29,7 +29,7 @@ unknown.highlight	"#f0f0ff"
+$OpenBSD: patch-xdmchoose_conf,v 1.2 2003/05/12 20:11:28 naddy Exp $
+--- xdmchoose.conf.orig	Mon May 12 12:17:11 2003
++++ xdmchoose.conf	Mon May 12 12:19:52 2003
+@@ -32,7 +32,7 @@ unknown.highlight	"#f0f0ff"
  unknown.shadow		"#808090"
  unknown.tentry		"gray90"
  
diff --git a/x11/xdmchoose/patches/patch-xdmchoose_conf_5 b/x11/xdmchoose/patches/patch-xdmchoose_conf_5
new file mode 100644
index 00000000000..f71dd870174
--- /dev/null
+++ b/x11/xdmchoose/patches/patch-xdmchoose_conf_5
@@ -0,0 +1,12 @@
+$OpenBSD: patch-xdmchoose_conf_5,v 1.1 2003/05/12 20:11:28 naddy Exp $
+--- xdmchoose.conf.5.orig	Mon May 12 11:58:40 2003
++++ xdmchoose.conf.5	Mon May 12 11:58:51 2003
+@@ -62,7 +62,7 @@ Visual components are configured using t
+ \fBforeground\fR \fIstring\fR
+ foreground colour.  This can be any X-understood colour spec - either a name in the colour database (\fIXlib Volume 1\fR) or a #RRGGBB style definition.
+ .TP
+-\fBbackground\fR \fIstring\R
++\fBbackground\fR \fIstring\fR
+ background colour.  For the panel, this can be a path to an xpm image.
+ .TP
+ \fBhighlight\fR \fIstring\fR
diff --git a/x11/xdmchoose/pkg/PLIST b/x11/xdmchoose/pkg/PLIST
index 6b71d9d8529..bc5499d0b46 100644
--- a/x11/xdmchoose/pkg/PLIST
+++ b/x11/xdmchoose/pkg/PLIST
@@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/02/18 16:27:28 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/05/12 20:11:29 naddy Exp $
 bin/xdmchooser
 bin/xdmping
+man/man1/xdmchoose.1
+man/man5/xdmchoose.conf.5
 share/examples/xdmchoose/xdmchoose.conf
 share/xdmchoose/xdmchoose-blur.xpm
 share/xdmchoose/xdmchoose-plain.xpm
 share/xdmchoose/xdmchoose-tiled.xpm
-@dirrm share/examples/xdmchoose
 @dirrm share/xdmchoose
+@dirrm share/examples/xdmchoose