diff --git a/src/etc/Makefile b/src/etc/Makefile
index f8cd0a5f..127d850e 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.450 2017/02/12 08:56:17 landry Exp $
+#	$OpenBSD: Makefile,v 1.451 2017/02/26 16:51:18 matthieu Exp $
 
 .include <bsd.own.mk>
 
@@ -57,7 +57,7 @@ RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd eigrpd ftpd \
 	pflogd portmap radiusd rarpd rbootd rebound relayd ripd route6d \
 	rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
 	spamlogd sshd statd switchd syslogd tftpd tftpproxy unbound \
-	vmd watchdogd wsmoused xdm ypbind ypldap ypserv
+	vmd watchdogd wsmoused xenodm ypbind ypldap ypserv
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz
 
diff --git a/src/etc/mtree/BSD.x11.dist b/src/etc/mtree/BSD.x11.dist
index c54c704e..781a8db5 100644
--- a/src/etc/mtree/BSD.x11.dist
+++ b/src/etc/mtree/BSD.x11.dist
@@ -1,4 +1,4 @@
-#       $OpenBSD: BSD.x11.dist,v 1.43 2016/09/11 14:05:04 matthieu Exp $
+#       $OpenBSD: BSD.x11.dist,v 1.44 2017/02/26 16:51:18 matthieu Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 .
@@ -8,7 +8,7 @@
             ..
             twm
             ..
-            xdm
+            xenodm
                 pixmaps
                 ..
             ..
diff --git a/src/etc/rc b/src/etc/rc
index f82168a3..342c1353 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.492 2016/12/27 09:17:52 jca Exp $
+#	$OpenBSD: rc,v 1.493 2017/02/26 16:51:18 matthieu Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -566,7 +566,7 @@ ifconfig -g carp -carpdemote 128	# Disable carp interlock.
 mixerctl_conf
 
 echo -n 'starting local daemons:'
-start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xdm
+start_daemon apmd sensorsd hotplugd watchdogd cron wsmoused xenodm
 echo '.'
 
 date
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 00619d21..9048478b 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.212 2016/10/06 20:20:41 reyk Exp $
+#	$OpenBSD: rc.conf,v 1.213 2017/02/26 16:51:18 matthieu Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -73,7 +73,7 @@ vmd_flags=NO
 watchdogd_flags=NO
 wsmoused_flags=NO	# for enabling console mouse support (i386 alpha amd64)
 			# for ps/2 or usb mice: "", serial: "-p /dev/cua00"
-xdm_flags=NO		# on some architectures, you must also
+xenodm_flags=NO		# on some architectures, you must also
 			# disable console getty in /etc/ttys
 
 # services related to RPC, NFS, and YP
diff --git a/src/etc/rc.d/xdm b/src/etc/rc.d/xdm
deleted file mode 100644
index d9768fb8..00000000
--- a/src/etc/rc.d/xdm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: xdm,v 1.1 2011/07/07 18:42:17 robert Exp $
-
-daemon="/usr/X11R6/bin/xdm"
-
-. /etc/rc.d/rc.subr
-
-rc_cmd $1
diff --git a/src/etc/rc.d/xenodm b/src/etc/rc.d/xenodm
new file mode 100644
index 00000000..d8c85a8a
--- /dev/null
+++ b/src/etc/rc.d/xenodm
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# $OpenBSD: xenodm,v 1.1 2017/02/26 16:51:18 matthieu Exp $
+
+daemon="/usr/X11R6/bin/xenodm"
+
+. /etc/rc.d/rc.subr
+
+rc_cmd $1