diff --git a/kdesvn-build b/kdesvn-build
index 3217c5c..bb0e9f4 100755
--- a/kdesvn-build
+++ b/kdesvn-build
@@ -5304,15 +5304,10 @@ eval
     if ( exists $ENV{'COVERITY_RUN'} )
     {
 	print "Downloading Coverity Script\n";
-        open(SVN_CAT, "svn cat svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk/scripts/kdesvn-build-coverity|");
-	my $build_coverity = '';
-        while( <SVN_CAT> )
-        {
-	    $build_coverity .= $_;
-        }
-	close SVN_CAT;
+        my $coverity_filename = get_build_dir('global') . "/kdesvn-build-coverity";
+        system("svn cat svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk/scripts/kdesvn-build-coverity > $coverity_filename");
 	print "Eval kdesvn-build-coverity\n";
-	eval $build_coverity;
+	do "$coverity_filename";
     }
 
     @update_list = get_update_list();
diff --git a/kdesvn-build-coverity b/kdesvn-build-coverity
index d8a5552..24b0a8e 100644
--- a/kdesvn-build-coverity
+++ b/kdesvn-build-coverity
@@ -48,7 +48,7 @@ sub download_install_dbus()
     my $filename = "dbus-$dbus_version.tar.gz";
     my $dbus_url = "http://dbus.freedesktop.org/releases/$filename";
 
-    $tempdir = get_build_dir('global') . '/temp-dbus';
+    my $tempdir = get_build_dir('dbus');
     super_mkdir($tempdir) || die "could no create $tempdir";
     
     p_chdir($tempdir);
@@ -104,6 +104,7 @@ sub download_install_dbus()
         return 0;
     }
 
+    p_chdir ($source_dir)
     prune_under_directory($tempdir);
 
     return 1;
@@ -131,7 +132,7 @@ sub download_install_cmake()
     my $filename = "cmake-$cmake_version.tar.gz";
     my $cmake_url = "http://www.cmake.org/files/v2.4/$filename";
 
-    my $tempdir = get_build_dir('global') . '/temp-cmake';
+    my $tempdir = get_build_dir('cmake');
     super_mkdir($tempdir) || die "could no create $tempdir";
 
     p_chdir($tempdir);
@@ -182,6 +183,7 @@ sub download_install_cmake()
         return 0;
     }
 
+    p_chdir ($source_dir)
     prune_under_directory($tempdir);
 
     return 1;