diff --git a/ChangeLog b/ChangeLog
index c3c523cf7..7a1b16e5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-25  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* Xext/Makefile.am: 
+	Add SecurityPolicy file for XCSECURITY extension.
+	
+	* hw/xfree86/dummylib/Makefile.am:
+	Add README to EXTRA_DIST
+
 2005-09-23  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* configure.ac:
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index d043555ba..9dafa163d 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -1,5 +1,9 @@
 noinst_LTLIBRARIES = libXext.la
 
+INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
 sdk_HEADERS = xvdix.h xvmcext.h
 
 if MITSHM
@@ -20,6 +24,9 @@ endif
 
 if XCSECURITY   
 XCSECURITY_SRCS = security.c
+SERVERCONFIGdir = $(libdir)/xserver
+SERVERCONFIG_DATA = SecurityPolicy
+AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\"
 endif
 
 if XINERAMA
@@ -34,10 +41,6 @@ if XPRINT
 XPRINT_SRCS = xprint.c
 endif
 
-INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
 EXTRA_DIST = \
 	appgroup.h \
 	xvdisp.h
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
index 52766bf53..0af326167 100644
--- a/hw/xfree86/dummylib/Makefile.am
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -47,5 +47,4 @@ libdummy_nonserver_a_SOURCES = \
 	xf86verbose.c \
 	$(srcdir)/../os-support/shared/sigiostubs.c
 
-
-
+EXTRA_DIST = README