diff --git a/modules/helma/Search.js b/modules/helma/Search.js
index 478fd638..c4b97dd1 100644
--- a/modules/helma/Search.js
+++ b/modules/helma/Search.js
@@ -26,13 +26,13 @@
 /**
  * @fileoverview Fields and methods of the helma.Search class
  * <br /><br />
- * To use this optional module, its repository needs to be added to the 
+ * To use this optional module, its repository needs to be added to the
  * application, for example by calling app.addRepository('modules/helma/Search.js')
  */
 
 // take care of any dependencies
-app.addRepository('modules/helma/lucene-core.jar');
-app.addRepository('modules/helma/lucene-analyzers.jar');
+app.addRepository('modules/helma/lucene-core-2.2.0.jar');
+app.addRepository('modules/helma/lucene-analyzers-2.2.0.jar');
 
 
 if (!global.helma) {
@@ -47,7 +47,7 @@ if (!global.helma) {
  * creating a fulltext search index based on Apache Lucene.
  * @returns A newly created instance of this prototype.
  * @constructor
- * @author Robert Gaggl <robert@nomatic.org> 
+ * @author Robert Gaggl <robert@nomatic.org>
  */
 helma.Search = function() {
     try {
@@ -309,7 +309,7 @@ helma.Search.Index = function(directory, analyzer) {
     this.getAnalyzer = function() {
         return analyzer;
     };
-    
+
     /**
      * Returns a searcher for querying this index.
      * @returns A searcher useable for querying the index.
@@ -318,7 +318,7 @@ helma.Search.Index = function(directory, analyzer) {
     this.getSearcher = function() {
         return new helma.Search.Searcher(this);
     };
-    
+
     /** @ignore */
     this.toString = function() {
         return ("[Lucene Index " + directory + "]");
@@ -773,7 +773,7 @@ helma.Search.HitCollection = function(hits) {
     this.length = function() {
         return this.size();
     };
-    
+
     /**
      * Executes a provided function once per hit.
      * @param {Function} fun Function to execute for each element
@@ -793,7 +793,7 @@ helma.Search.HitCollection = function(hits) {
         }
         return;
     };
-    
+
     return this;
 };
 
@@ -1308,7 +1308,7 @@ helma.Search.Document.Field = function(name, value, options) {
         var store = pkg.Store.YES;
         var index = pkg.Index.TOKENIZED;
         var termVector = pkg.TermVector.NO;
-    
+
         var opt;
         if (options != null) {
             if (options.store != null) {
diff --git a/modules/helma/build.gradle b/modules/helma/build.gradle
index 3222906c..b6cc653a 100644
--- a/modules/helma/build.gradle
+++ b/modules/helma/build.gradle
@@ -1,6 +1,8 @@
 dependencies {
 	runtime 'ch.ethz.ganymed:ganymed-ssh2:build208'
 	runtime 'net.sourceforge.jexcelapi:jxl:2.5.7'
+	runtime 'org.apache.lucene:lucene-analyzers:2.2.0'
+	runtime 'org.apache.lucene:lucene-core:2.2.0'
 }
 
 task deps(type: Copy) {
diff --git a/modules/helma/lucene-analyzers.jar b/modules/helma/lucene-analyzers-2.2.0.jar
similarity index 99%
rename from modules/helma/lucene-analyzers.jar
rename to modules/helma/lucene-analyzers-2.2.0.jar
index 7e37b731..86226042 100644
Binary files a/modules/helma/lucene-analyzers.jar and b/modules/helma/lucene-analyzers-2.2.0.jar differ
diff --git a/modules/helma/lucene-core.jar b/modules/helma/lucene-core-2.2.0.jar
similarity index 100%
rename from modules/helma/lucene-core.jar
rename to modules/helma/lucene-core-2.2.0.jar