diff --git a/x11/xdm/Makefile b/x11/xdm/Makefile
index 91d43e0a387b..51dbe090bd27 100644
--- a/x11/xdm/Makefile
+++ b/x11/xdm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdm
-PORTVERSION=	1.1.10
+PORTVERSION=	1.1.11
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
@@ -24,6 +24,19 @@ MAN1=		xdm.1
 CFFILES=	GiveConsole TakeConsole Xaccess Xreset Xresources \
 		Xservers Xsession Xsetup_0 Xstartup Xwilling xdm-config
 
+OPTIONS=	XDMSHELL "Install xdmshell" off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_XDMSHELL)
+CONFIGURE_ARGS+=--enable-xdmshell
+MAN1+=		xdmshell.1
+PLIST_SUB+=	XDMSHELL=""
+.else
+CONFIGURE_ARGS+=--disable-xdmshell
+PLIST_SUB+=	XDMSHELL="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|XDMCONFIGDIR/|${PREFIX}/lib/X11/xdm/|" \
 		-e "s|XDMSCRIPTDIR/|${PREFIX}/lib/X11/xdm/|" \
diff --git a/x11/xdm/distinfo b/x11/xdm/distinfo
index c7a570a0f0a3..c67b21b8ef5d 100644
--- a/x11/xdm/distinfo
+++ b/x11/xdm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/app/xdm-1.1.10.tar.bz2) = 1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f
-SIZE (xorg/app/xdm-1.1.10.tar.bz2) = 423578
+SHA256 (xorg/app/xdm-1.1.11.tar.bz2) = d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47
+SIZE (xorg/app/xdm-1.1.11.tar.bz2) = 446612
diff --git a/x11/xdm/files/patch-session.c b/x11/xdm/files/patch-xdm_session.c
similarity index 88%
rename from x11/xdm/files/patch-session.c
rename to x11/xdm/files/patch-xdm_session.c
index 6eb34ed2346f..de1c579b4f8b 100644
--- a/x11/xdm/files/patch-session.c
+++ b/x11/xdm/files/patch-xdm_session.c
@@ -1,5 +1,5 @@
---- session.c.orig	Sun Jun  3 22:49:51 2007
-+++ session.c	Sun Jun  3 22:56:06 2007
+--- xdm/session.c.orig	Sun Jun  3 22:49:51 2007
++++ xdm/session.c	Sun Jun  3 22:56:06 2007
 @@ -543,6 +543,7 @@
      pid_t	pid;
  #ifdef HAS_SETUSERCONTEXT
diff --git a/x11/xdm/pkg-plist b/x11/xdm/pkg-plist
index dcdc249da93b..5b28dd43023a 100644
--- a/x11/xdm/pkg-plist
+++ b/x11/xdm/pkg-plist
@@ -1,8 +1,7 @@
 bin/xdm
-bin/xdmshell
+%%XDMSHELL%%bin/xdmshell
 lib/X11/xdm/authdir
 lib/X11/xdm/chooser
-lib/X11/xdm/libXdmGreet.a
 lib/X11/xdm/libXdmGreet.la
 lib/X11/xdm/libXdmGreet.so
 lib/X11/xdm/pixmaps/xorg-bw.xpm