--- Makefile.in.orig	Mon Jun 19 18:44:04 2006
+++ Makefile.in	Tue Dec 19 15:42:41 2006
@@ -224,9 +224,6 @@
 	@echo "very dangerous.  Note that you do not have to manually add a "
 	@echo "database user or set up a database for RT.  These actions will be "
 	@echo "taken care of in the next step.)"
-	@echo ""
-	@echo "After that, you need to initialize RT's database by running" 
-	@echo " 'make initialize-database'"
 
 #	@echo " or by executing "       
 #	@echo " '$(RT_SBIN_PATH)/rt-setup-database --action init \ "
@@ -276,15 +273,18 @@
 	chmod $(RT_READABLE_DIR_MODE) $(DESTDIR)/$(RT_BIN_PATH)	
 
 	chmod 0755 $(DESTDIR)/$(RT_ETC_PATH)
-	chmod 0500 $(DESTDIR)/$(RT_ETC_PATH)/*
+	chmod 0400 $(DESTDIR)/$(RT_ETC_PATH)/*
 
 	#TODO: the config file should probably be able to have its
 	# owner set separately from the binaries.
 	chown -R $(BIN_OWNER) $(DESTDIR)/$(RT_ETC_PATH)
 	chgrp -R $(RTGROUP) $(DESTDIR)/$(RT_ETC_PATH)
 
-	chmod 0550 $(DESTDIR)/$(CONFIG_FILE)
-	chmod 0550 $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chmod 0440 $(DESTDIR)/$(CONFIG_FILE)
+	chmod 0440 $(DESTDIR)/$(SITE_CONFIG_FILE)-dist
+	-chmod 0640 $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chgrp $(WEB_GROUP) $(DESTDIR)/$(CONFIG_FILE)
+	-chgrp $(WEB_GROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)
 
 	# Make the interfaces executable
 	chown $(BIN_OWNER) $(BINARIES)
@@ -331,13 +331,13 @@
 config-install:
 	mkdir -p $(DESTDIR)/$(CONFIG_FILE_PATH)	
 	-cp etc/RT_Config.pm $(DESTDIR)/$(CONFIG_FILE)
-	[ -f $(DESTDIR)/$(SITE_CONFIG_FILE) ] || cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE) 
+	-cp etc/RT_SiteConfig.pm $(DESTDIR)/$(SITE_CONFIG_FILE)-dist
 
 	chgrp $(RTGROUP) $(DESTDIR)/$(CONFIG_FILE)
 	chown $(BIN_OWNER) $(DESTDIR)/$(CONFIG_FILE)
 
-	chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)
-	chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)
+	chgrp $(RTGROUP) $(DESTDIR)/$(SITE_CONFIG_FILE)-dist
+	chown $(BIN_OWNER) $(DESTDIR)/$(SITE_CONFIG_FILE)-dist
 
 	@echo "Installed configuration. about to install rt in  $(RT_PATH)"