diff --git a/ChangeLog b/ChangeLog
index b36fa9b8a..dd909167b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2005-09-14  Eric Anholt  <anholt@FreeBSD.org>
+
+	* hw/xfree86/Makefile.am:
+	Bug #4046: Install the X.Org server setuid root. (David Schleef)
+
 2005-09-14  Eric Anholt  <anholt@FreeBSD.org>
 
 	* configure.ac:
 	* hw/xfree86/Makefile.am:
 	Bug #3889: Create the log dir on install, and allow configuring
 	specifically that directory.  Failure to have the directory keeps the
-	xorg server from starting.
+	xorg server from starting. (David Schleef)
 
 2005-09-14  Eric Anholt  <anholt@FreeBSD.org>
 
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index de62ebe50..5de87c9e6 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -66,3 +66,7 @@ endif
 
 install-data-local:
 	$(mkdir_p) $(logdir)
+
+install-exec-local:
+	chown root $(DESTDIR)$(bindir)/Xorg
+	chmod u+s $(DESTDIR)$(bindir)/Xorg