diff --git a/eclipse-m2e-core-lucene-fsdirectory.patch b/eclipse-m2e-core-lucene-fsdirectory.patch
new file mode 100644
index 0000000..eea8a1c
--- /dev/null
+++ b/eclipse-m2e-core-lucene-fsdirectory.patch
@@ -0,0 +1,20 @@
+--- org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java.bak	2015-12-12 23:05:47.306739583 +0000
++++ org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/index/nexus/NexusIndexManager.java	2015-12-12 23:09:06.541707827 +0000
+@@ -842,7 +842,7 @@
+   }
+ 
+   protected Directory getIndexDirectory(IRepository repository) throws IOException {
+-    return FSDirectory.getDirectory(getIndexDirectoryFile(repository));
++    return FSDirectory.open(getIndexDirectoryFile(repository));
+   }
+ 
+   public IndexedArtifactGroup resolveGroup(IndexedArtifactGroup group) {
+@@ -1131,7 +1131,7 @@
+             String details = getIndexDetails(repository);
+             String id = repository.getUid() + "-cache"; //$NON-NLS-1$
+             File luceneCache = new File(request.getLocalIndexCacheDir(), details);
+-            Directory directory = FSDirectory.getDirectory(luceneCache);
++            Directory directory = FSDirectory.open(luceneCache);
+             IndexingContext cacheCtx = getIndexer().addIndexingContextForced(id, id, null, directory, null, null,
+                 getIndexers(details));
+             request = newIndexUpdateRequest(repository, cacheCtx, monitor);
diff --git a/eclipse-m2e-core.spec b/eclipse-m2e-core.spec
index 8419535..c47ae3f 100644
--- a/eclipse-m2e-core.spec
+++ b/eclipse-m2e-core.spec
@@ -7,7 +7,7 @@
 
 Name:           eclipse-m2e-core
 Version:        1.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Maven integration for Eclipse
 
 Group:          Development/Tools
@@ -28,9 +28,6 @@ Patch1:         %{name}-m2e.core-resourcefetcher.patch
 # Method returns collection of ArtifactInfo instances rather than just one
 Patch2:         %{name}-artifactinfo-return-type.patch
 
-# Work with Lucene 5.x api
-Patch3:         %{name}-lucene-5.patch
-
 # API change in maven-indexer 5.1.1
 Patch4:        %{name}-indexer-5.1.1.patch
 Patch6:        %{name}-NexusIndexManager.patch
@@ -45,6 +42,9 @@ Patch7:        %{name}-jetty-8.patch
 # See https://dev.eclipse.org/mhonarc/lists/p2-dev/msg05465.html
 Patch8:        %{name}-mandatory-OSGi-attributes.patch
 
+# FSDirectory class has a different api than what m2e appears to expect
+Patch9:        %{name}-lucene-fsdirectory.patch
+
 BuildArch:      noarch
 
 # Maven build-requires for the main build.  After successfull build
@@ -52,6 +52,8 @@ BuildArch:      noarch
 #   xmvn-builddep <path-to-build-log>
 BuildRequires:  maven-local
 BuildRequires:  eclipse-license
+BuildRequires:  lucene3
+BuildRequires:  lucene3-contrib
 BuildRequires:  mvn(io.takari.m2e.workspace:org.eclipse.m2e.workspace.cli)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
@@ -182,13 +184,8 @@ Requires:       jetty8
 Requires:       jetty-util
 Requires:       jsr-305
 Requires:       log4j12
-Requires:       lucene
-Requires:       lucene-analysis
-Requires:       lucene-highlighter
-Requires:       lucene-memory
-Requires:       lucene-queries
-Requires:       lucene-queryparser
-Requires:       lucene-sandbox
+Requires:       lucene3
+Requires:       lucene3-contrib
 Requires:       maven
 Requires:       maven-archetype-catalog
 Requires:       maven-archetype-common
@@ -335,6 +332,9 @@ xmvn-subst -s `find %{buildroot}%{install_loc} -name jars` $extra
 
 
 %changelog
+* Sat Dec 12 2015 Gerard Ryan <galileo@fedoraproject.org> - 1.6.2-3
+- Update for new maven-indexer build (lucene3)
+
 * Wed Oct 14 2015 Mat Booth <mat.booth@redhat.com> - 1.6.2-2
 - Rebuild for new eclipse-m2e-workspace