diff --git a/features/org.eclipse.epp.logging.3rd.feature/feature.xml b/features/org.eclipse.epp.logging.3rd.feature/feature.xml
index def8559..3db0799 100644
--- a/features/org.eclipse.epp.logging.3rd.feature/feature.xml
+++ b/features/org.eclipse.epp.logging.3rd.feature/feature.xml
@@ -108,14 +108,14 @@
          id="org.apache.lucene.core"
          download-size="0"
          install-size="0"
-         version="6.1.0.v20161115-1612"
+         version="6.1.0.qualifier"
          unpack="false"/>
 
    <plugin
          id="org.apache.lucene.analyzers-common"
          download-size="0"
          install-size="0"
-         version="6.1.0.v20161115-1612"
+         version="6.1.0.qualifier"
          unpack="false"/>
 
    <plugin
diff --git a/releng/targets/oxygen/oxygen.target b/releng/targets/oxygen/oxygen.target
index 289104b..9c2dd8f 100644
--- a/releng/targets/oxygen/oxygen.target
+++ b/releng/targets/oxygen/oxygen.target
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Target Definition for Eclipse Oxygen (4.7)" sequenceNumber="3">
+<?pde version="3.8"?><target name="Target Definition for Eclipse Oxygen (4.7)" sequenceNumber="4">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7milestones/S-4.7RC4a-201706120950/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.7-M-builds/M-4.7.1RC1-201708170500/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
@@ -30,6 +30,8 @@
 <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
 <unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
 <unit id="org.apache.lucene.core" version="3.5.0.v20120725-1805"/>
+<unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/>
+<unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/>
 <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
 <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
 <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
@@ -39,8 +41,8 @@
 <unit id="org.objenesis" version="1.0.0.v201505121915"/>
 <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
 <unit id="org.yaml.snakeyaml" version="1.14.0.v201604211500"/>
-<!-- Recommended Orbit build for Oxygen -->
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
+<!-- Orbit M-build for Oxygen.1 RC1 -->
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/M20170818183741/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.feature.group" version="2.2.1.201402241301"/>