diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 6dfb4290412b..65ab112a321c 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	xdm
 PORTVERSION=	1.1.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X display manager
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	xsm:x11/xsm
 
 EXTRACT_SUFX=	.tar.xz
 USES=		cpe libtool xorg xorg-cat:app
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xau xaw xdmcp xext xinerama xmu xpm xrender xt
 USE_RC_SUBR=	xdm
 CPE_PRODUCT=	x_display_manager
 CPE_VENDOR=	x
 
 CONFIGURE_ARGS+=	--with-xdmconfigdir=${PREFIX}/etc/X11/xdm \
 			--with-xdmscriptdir=${PREFIX}/etc/X11/xdm \
 			--with-pixmapdir=${PREFIX}/share/pixmaps \
 			--with-authdir=/var/db/xdm
 
 CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
 		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	XDMSHELL XFT
 OPTIONS_DEFAULT=	XFT
 XDMSHELL_DESC=	Install xdmshell
 
 XDMSHELL_CONFIGURE_ENABLE=	xdmshell
 
 XFT_USE=	xorg=xft
 XFT_CONFIGURE_WITH=	xft
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|@DESTDIR@||" ${WRKSRC}/Makefile.in
 
 post-install:
 .for f in ${CFFILES}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f} ${STAGEDIR}${PREFIX}/etc/X11/xdm/${f}.sample
 .endfor
 	@${MKDIR} ${STAGEDIR}/var/db/xdm
 
 .include <bsd.port.mk>
diff --git a/x11/xdm/files/xdm.in b/x11/xdm/files/xdm.in
index dae4a2a40039..4f46257a5da4 100644
--- a/x11/xdm/files/xdm.in
+++ b/x11/xdm/files/xdm.in
@@ -1,44 +1,48 @@
 #!/bin/sh
 
 # PROVIDE: xdm
 # REQUIRE: LOGIN
 # KEYWORD: nojail shutdown
 #
 # Add the following line to /etc/rc.conf to enable xdm:
 # xdm_enable="YES"
 #
 # Optionally, you can set the vty that it appears on
 # (only useful in the unlikely event that you already have
 #  them allocated in /etc/ttys)
 # xdm_tty=ttyv8
 #
 # Alternatively, edit /etc/ttys and change the line below
 #   ttyv8   "%%PREFIX%%/bin/xdm -nodaemon"  xterm   off secure
 # to this:
 #   ttyv8   "%%PREFIX%%/bin/xdm -nodaemon"  xterm   on secure
 
 . /etc/rc.subr
 
 name="xdm"
 rcvar=xdm_enable
 desc="X.org X display manager"
 
 load_rc_config $name
 
 : ${xdm_enable:=NO}
 : ${xdm_tty:=default}
 
 command=%%PREFIX%%/bin/$name
 pidfile=/var/run/$name.pid
 if [ "${xdm_tty%%[0-9]*}" = "ttyv" ]; then
 	start_precmd=xdm_set_vty
 fi
 
 xdm_set_vty()
 {
 	# X views vt as starting at 01, not ttyv0
 	vtarg=`printf vt%02d $((${xdm_tty#ttyv} + 1))`
-	command_args="-server \":0 local %%LOCALBASE%%/bin/X :0 $vtarg\""
+	xserver_args=$(grep '^:0' %%LOCALBASE%%/etc/X11/xdm/Xservers)
+	if [ $? -ne 0 ]; then
+		xserver_args=":0 local %%LOCALBASE%%/bin/X :0"
+	fi
+	command_args="-server \"$xserver_args $vtarg\""
 }
 
 run_rc_command $1