diff --git a/tools/add_ds.sh b/tools/add_ds.sh
index b07e6a0..8bc3a9a 100755
--- a/tools/add_ds.sh
+++ b/tools/add_ds.sh
@@ -5,18 +5,16 @@
 ## my $newlinkname = 'NEWIDFROMKNOWNLINKSFILE';
 ## to reflect the ID in the known links file
 
-A=`ls -1`
+A=`find . -type f -name '*.rrd' | sed -r 's|/[^/]+$||' |sort |uniq`
+W=`pwd`
 
 for i in $A ; do
-	echo ""
-	echo "dir: $i"
-	echo ""
 	cd $i
 
 	for f in *.rrd; do
-		echo "file: $f"
+		echo "file: $i/$f"
 		mv $f $f.old
-		rrdtool dump $f.old | /data/as-stats/tools/add_ds_proc.pl | rrdtool restore - $f.new
+		rrdtool dump $f.old | $W/add_ds_proc.pl | rrdtool restore - $f.new
 		mv $f.new $f
 		rm -f $f.old
 	done