diff --git a/instasearch.feature/.project b/instasearch.feature/.project
index e71a898..fb05b19 100755
--- a/instasearch.feature/.project
+++ b/instasearch.feature/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.FeatureNature</nature>
 	</natures>
 </projectDescription>
diff --git a/instasearch.site/.project b/instasearch.site/.project
index b76c37f..c5c9f08 100755
--- a/instasearch.site/.project
+++ b/instasearch.site/.project
@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.UpdateSiteNature</nature>
 	</natures>
 </projectDescription>
diff --git a/instasearch/.classpath b/instasearch/.classpath
index 632eb5e..9b182f5 100755
--- a/instasearch/.classpath
+++ b/instasearch/.classpath
@@ -1,8 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry excluding="**/.svn/" kind="src" path="src"/>
-	<classpathentry excluding="**/.svn/" kind="src" path="test"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene_2.9.1.v201101211721.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.analysis_2.9.1.v201101211721.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.core_2.9.1.v201101211721.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.highlighter_2.9.1.v20100421-0704.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.memory_2.9.1.v20100421-0704.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.misc_2.9.1.v20100421-0704.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.queries_2.9.1.v20100421-0704.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.snowball_2.9.1.v20100421-0704.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/org.apache.lucene.spellchecker_2.9.1.v20100421-0704.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src/"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/instasearch/.project b/instasearch/.project
index 7c683fb..bcd6d77 100755
--- a/instasearch/.project
+++ b/instasearch/.project
@@ -20,8 +20,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/instasearch/META-INF/MANIFEST.MF b/instasearch/META-INF/MANIFEST.MF
index 7f5e4ce..639d3e6 100755
--- a/instasearch/META-INF/MANIFEST.MF
+++ b/instasearch/META-INF/MANIFEST.MF
@@ -2,13 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: InstaSearch
 Bundle-SymbolicName: it.unibz.instasearch;singleton:=true
-Bundle-Version: 1.5.7
+Bundle-Version: 1.5.8
 Bundle-Activator: it.unibz.instasearch.InstaSearchPlugin
 Bundle-DocURL: https://github.com/ajermakovics/eclipse-instasearch
 Bundle-UpdateLocation: http://dl.bintray.com/ajermakovics/InstaSearch/
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
- org.apache.lucene;bundle-version="[2.9.1,2.9.2]",
- org.apache.lucene.analysis;bundle-version="[2.9.1,2.9.2)",
  org.apache.commons.lang,
  org.eclipse.ui.ide,
  org.eclipse.ui.editors,
@@ -20,15 +18,18 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.debug.ui,
  org.eclipse.jdt.ui;resolution:=optional,
  org.eclipse.jdt.core;resolution:=optional,
- org.junit;bundle-version="4.0.0";resolution:=optional,
- org.apache.lucene.highlighter;bundle-version="[2.9.1,2.9.2)",
- org.apache.lucene.memory;bundle-version="[2.9.1,2.9.2)",
- org.apache.lucene.misc;bundle-version="[2.9.1,2.9.2)",
- org.apache.lucene.queries;bundle-version="[2.9.1,2.9.2)",
- org.apache.lucene.snowball;bundle-version="[2.9.1,2.9.2)",
- org.apache.lucene.spellchecker;bundle-version="[2.9.1,2.9.2)"
+ org.junit;bundle-version="4.0.0";resolution:=optional
 Bundle-Vendor: Andrejs Jermakovics
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/org.apache.lucene_2.9.1.v201101211721.jar,
+ lib/org.apache.lucene.analysis_2.9.1.v201101211721.jar,
+ lib/org.apache.lucene.core_2.9.1.v201101211721.jar,
+ lib/org.apache.lucene.highlighter_2.9.1.v20100421-0704.jar,
+ lib/org.apache.lucene.memory_2.9.1.v20100421-0704.jar,
+ lib/org.apache.lucene.misc_2.9.1.v20100421-0704.jar,
+ lib/org.apache.lucene.queries_2.9.1.v20100421-0704.jar,
+ lib/org.apache.lucene.snowball_2.9.1.v20100421-0704.jar,
+ lib/org.apache.lucene.spellchecker_2.9.1.v20100421-0704.jar
 Eclipse-LazyStart: false
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/instasearch/build.properties b/instasearch/build.properties
index 4b866f1..acdb511 100755
--- a/instasearch/build.properties
+++ b/instasearch/build.properties
@@ -4,6 +4,15 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                icons/,\
-               plugin.properties
+               plugin.properties,\
+               lib/org.apache.lucene_2.9.1.v201101211721.jar,\
+               lib/org.apache.lucene.analysis_2.9.1.v201101211721.jar,\
+               lib/org.apache.lucene.core_2.9.1.v201101211721.jar,\
+               lib/org.apache.lucene.highlighter_2.9.1.v20100421-0704.jar,\
+               lib/org.apache.lucene.memory_2.9.1.v20100421-0704.jar,\
+               lib/org.apache.lucene.misc_2.9.1.v20100421-0704.jar,\
+               lib/org.apache.lucene.queries_2.9.1.v20100421-0704.jar,\
+               lib/org.apache.lucene.snowball_2.9.1.v20100421-0704.jar,\
+               lib/org.apache.lucene.spellchecker_2.9.1.v20100421-0704.jar
 bin.excludes = icons/sample.gif
 src.excludes = test/
diff --git a/instasearch/lib/org.apache.lucene.analysis_2.9.1.v201101211721.jar b/instasearch/lib/org.apache.lucene.analysis_2.9.1.v201101211721.jar
new file mode 100644
index 0000000..3a2f4da
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.analysis_2.9.1.v201101211721.jar differ
diff --git a/instasearch/lib/org.apache.lucene.core_2.9.1.v201101211721.jar b/instasearch/lib/org.apache.lucene.core_2.9.1.v201101211721.jar
new file mode 100644
index 0000000..a5cfb35
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.core_2.9.1.v201101211721.jar differ
diff --git a/instasearch/lib/org.apache.lucene.highlighter_2.9.1.v20100421-0704.jar b/instasearch/lib/org.apache.lucene.highlighter_2.9.1.v20100421-0704.jar
new file mode 100644
index 0000000..a3d2af9
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.highlighter_2.9.1.v20100421-0704.jar differ
diff --git a/instasearch/lib/org.apache.lucene.memory_2.9.1.v20100421-0704.jar b/instasearch/lib/org.apache.lucene.memory_2.9.1.v20100421-0704.jar
new file mode 100644
index 0000000..2d46c00
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.memory_2.9.1.v20100421-0704.jar differ
diff --git a/instasearch/lib/org.apache.lucene.misc_2.9.1.v20100421-0704.jar b/instasearch/lib/org.apache.lucene.misc_2.9.1.v20100421-0704.jar
new file mode 100644
index 0000000..46db3a6
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.misc_2.9.1.v20100421-0704.jar differ
diff --git a/instasearch/lib/org.apache.lucene.queries_2.9.1.v20100421-0704.jar b/instasearch/lib/org.apache.lucene.queries_2.9.1.v20100421-0704.jar
new file mode 100644
index 0000000..9c9451f
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.queries_2.9.1.v20100421-0704.jar differ
diff --git a/instasearch/lib/org.apache.lucene.snowball_2.9.1.v20100421-0704.jar b/instasearch/lib/org.apache.lucene.snowball_2.9.1.v20100421-0704.jar
new file mode 100644
index 0000000..52b6626
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.snowball_2.9.1.v20100421-0704.jar differ
diff --git a/instasearch/lib/org.apache.lucene.spellchecker_2.9.1.v20100421-0704.jar b/instasearch/lib/org.apache.lucene.spellchecker_2.9.1.v20100421-0704.jar
new file mode 100644
index 0000000..4618229
Binary files /dev/null and b/instasearch/lib/org.apache.lucene.spellchecker_2.9.1.v20100421-0704.jar differ
diff --git a/instasearch/lib/org.apache.lucene_2.9.1.v201101211721.jar b/instasearch/lib/org.apache.lucene_2.9.1.v201101211721.jar
new file mode 100644
index 0000000..3558e7d
Binary files /dev/null and b/instasearch/lib/org.apache.lucene_2.9.1.v201101211721.jar differ