diff --git a/package/base/rock-src/rock-src.conf b/package/base/rock-src/rock-src.conf
index ee3ab37c2..95140c80f 100644
--- a/package/base/rock-src/rock-src.conf
+++ b/package/base/rock-src/rock-src.conf
@@ -21,11 +21,20 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 rs_main() {
-	rm -rf $root/usr/src/rock-src-$rockver; cd $base
+	rm -rf $root/usr/src/rock-src-$rockver.tar.bz2
+
+	cd $base
 	./scripts/Create-SrcTar $root/usr/src/rock-src-$rockver.tar.bz2
-	cd $root/usr/src; tar $taropt rock-src-$rockver.tar.bz2
-	rm -f rock-src; ln -sv rock-src-$rockver rock-src
-	rm -f rock-src-$rockver.tar.bz2
+
+	cd $root/usr/src
+	rm -rf rock-src-$rockver rock-src
+
+	mkdir rock-src
+	ln -s rock-src rock-src-$rockver
+
+	tar $taropt rock-src-$rockver.tar.bz2
+	# rm -f rock-src-$rockver.tar.bz2
+	rm -f rock-src-$rockver
 }
 
 srctar=none
diff --git a/scripts/Create-SrcTar b/scripts/Create-SrcTar
index 79f06f55f..10e3aa7d3 100755
--- a/scripts/Create-SrcTar
+++ b/scripts/Create-SrcTar
@@ -32,36 +32,20 @@ src="`mktemp -d -p $PWD src.srctar.XXXXXXXXXX`"
 rm -rf $src/rock-src-$rockver
 mkdir -p $src/rock-src-$rockver
 #
-echo "ROCK Linux $rockver" > $src/rock-src-$rockver/VERSION
-#
-for x in README COPYING scripts target misc \
-         package architecture Documentation
+for x in scripts target misc package architecture Documentation
 do
-	[ -d $x ] && ln -s ../../$x $src/rock-src-$rockver/$x
-	[ -f $x ] && cp -a $x $src/rock-src-$rockver/$x
+	ln -s ../../$x $src/rock-src-$rockver/$x
 done
-#
-mkdir -p $src/rock-src-$rockver/download
-
-if [ ! -f download/INDEX ] ; then
-	echo -e "\nFile \"download/INDEX\" not found."
-	echo "Running \"./scripts/Puzzle\" to generate it.";\
-	./scripts/Puzzle;
-fi
-
-cp download/INDEX $src/rock-src-$rockver/download/
 
 # Create tar file
 #
-(
-	cd $src
-	tar --use-compress-program=bzip2 --owner root --group root \
-	    --exclude .svn --exclude CVS \
-	    -cf - rock-src-$rockver/*/* rock-src-$rockver/[CRV]*
-) > ${1:-rock-src-$rockver.tar.bz2}
+cd $src
+tar --use-compress-program=bzip2 --owner root --group root \
+    --exclude .svn --exclude CVS -cf ${1:-rock-src-$rockver.tar.bz2} rock-src-$rockver/*/*
 
 # Done.
 #
+cd $base
 rm -rf $src/
 du -sh ${1:-rock-src-$rockver.tar.bz2} | tr '\t' ' '