diff --git a/.cvsignore b/.cvsignore
index 352f065..e69de29 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +0,0 @@
-rootfiles.tar.gz
diff --git a/dot-bash_logout b/dot-bash_logout
new file mode 100644
index 0000000..926eddc
--- /dev/null
+++ b/dot-bash_logout
@@ -0,0 +1,3 @@
+# ~/.bash_logout
+
+clear
diff --git a/dot-bash_profile b/dot-bash_profile
new file mode 100644
index 0000000..fdd06ac
--- /dev/null
+++ b/dot-bash_profile
@@ -0,0 +1,13 @@
+# .bash_profile
+
+# Get the aliases and functions
+if [ -f ~/.bashrc ]; then
+	. ~/.bashrc
+fi
+
+# User specific environment and startup programs
+
+PATH=$PATH:$HOME/bin
+
+export PATH
+unset USERNAME
diff --git a/dot-bashrc b/dot-bashrc
new file mode 100644
index 0000000..6e6d1e1
--- /dev/null
+++ b/dot-bashrc
@@ -0,0 +1,12 @@
+# .bashrc
+
+# User specific aliases and functions
+
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
diff --git a/dot-cshrc b/dot-cshrc
new file mode 100644
index 0000000..d087a90
--- /dev/null
+++ b/dot-cshrc
@@ -0,0 +1,7 @@
+# .cshrc
+
+# User specific aliases and functions
+
+alias rm 'rm -i'
+alias cp 'cp -i'
+alias mv 'mv -i'
diff --git a/dot-tcshrc b/dot-tcshrc
new file mode 100644
index 0000000..5bcfd29
--- /dev/null
+++ b/dot-tcshrc
@@ -0,0 +1,8 @@
+# .tcshrc
+
+# User specific aliases and functions
+
+alias rm 'rm -i'
+alias cp 'cp -i'
+alias mv 'mv -i'
+
diff --git a/rootfiles.spec b/rootfiles.spec
index 028f4c6..0e1bd47 100644
--- a/rootfiles.spec
+++ b/rootfiles.spec
@@ -1,10 +1,15 @@
 Summary: The basic required files for the root user's directory.
 Name: rootfiles
-Version: 7.2
-Release: 7
+Version: 8
+Release: 1
 License: Public Domain
 Group: System Environment/Base
-Source: rootfiles.tar.gz
+Source0: dot-bashrc
+Source1: dot-bash_profile
+Source2: dot-bash_logout
+Source3: dot-tcshrc
+Source4: dot-cshrc
+
 BuildRoot: %{_tmppath}/%{name}%{name}-root
 BuildArchitectures: noarch
 
@@ -15,35 +20,28 @@ as those in /etc/skel, which are placed in regular
 users' home directories.
 
 %prep
-%setup -q -n rootfiles
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/root
-tar -cvSpf- . | (cd $RPM_BUILD_ROOT/root ; tar -xSpf-)
 
-cd $RPM_BUILD_ROOT/root
-mv .Xdefaults .Xresources
+for file in %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do 
+  f=`basename $file`
+  install -m 644 $file $RPM_BUILD_ROOT/root/${f/dot-/.}
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-# we used to put .Xclients in this package -- back it up if it's been
-# customized
-cd /root
-if [ -f .Xclients -a -x /bin/awk ]; then
-    m=`md5sum .Xclients | awk '{ print $1 }'`
-    if [ $m != "506b9496f2853fc9fee6c6b1c5f3ee48" ]; then
-	mv .Xclients .Xclients.rpmsave
-    fi
-fi
-
 %files
 %defattr(-,root,root)
-%config /root/.[A-Za-z]*
+%config(noreplace) /root/.[A-Za-z]*
 
 %changelog
+* Wed Sep 22 2004 Bill Nottingham <notting@redhat.com> 8-1
+- sync files with current /etc/skel stuff
+- remove Xresources (#75666)
+
 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 5a4bf6b..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-5480ce957e9784091bf2983c64ee7683  rootfiles.tar.gz