diff --git a/kdesvn-build b/kdesvn-build
index e54349a..e736446 100755
--- a/kdesvn-build
+++ b/kdesvn-build
@@ -5363,11 +5363,15 @@ eval
     if (exists $ENV{'COVERITY_RUN'} )
     {
         info "Fixing the Build by downloading the Coverity Patch Script.";
-        open(C, "-|", "svn", "cat",
-            "svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk/scripts/kdesvn-build-coverity");
+        if (-e "$0-coverity") {
+            open(C, "< $0-coverity") or die;
+        } else {
+            open(C, "-|", "svn", "cat",
+                "svn://anonsvn.kde.org/home/kde/trunk/KDE/kdesdk/scripts/kdesvn-build-coverity");
+        }
         my @plugin = <C>;
         close(C);
-        eval "@plugin";
+        eval "@plugin" or die;
     }
 
     eval { plugin_setup_default_modules(\@update_list, \@build_list, \%package_opts); };
diff --git a/kdesvn-build-coverity b/kdesvn-build-coverity
index 352098f..6a79c1d 100644
--- a/kdesvn-build-coverity
+++ b/kdesvn-build-coverity
@@ -29,6 +29,22 @@ sub check_dbus_installed()
     return ($result >> 8) == 0;
 }
 
+# Check that CLucene is installed.
+# CLucene is required by Strigi in playground/base
+sub check_clucene_installed()
+{
+    # this efficient check algorithm was copied from the cmake check
+    return 0;
+}
+
+# Install CLucene
+# CLucene is required by Strigi in playground/base
+sub download_install_clucene()
+{
+    return download_install_tar('clucene-core', '0.9.16',
+        "http://surfnet.dl.sourceforge.net/sourceforge/clucene", [ ] );
+}
+
 sub download_install_tar($$$$)
 {
     return 1 if pretending;
@@ -233,6 +249,15 @@ sub perform_coverity_checks()
         note "lcms appears to be installed. Continuing. ";
     }
 
+    unless (check_clucene_installed())
+    {
+        note "CLucene does not appear to be installed.";
+        if (not download_install_clucene())
+        {
+            error "\nCLucene can not be installed.";
+            error "Check your logs afterwards.";
+        }
+    }
 
     # Print blank line.
     note "";