diff --git a/com.google.eclipse.protobuf.feature/feature.xml b/com.google.eclipse.protobuf.feature/feature.xml
index f07a5de..5535b5a 100644
--- a/com.google.eclipse.protobuf.feature/feature.xml
+++ b/com.google.eclipse.protobuf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.google.eclipse.protobuf"
       label="%featureName"
-      version="1.5.0.qualifier"
+      version="1.5.2.qualifier"
       provider-name="%providerName">
 
    <description url="https://code.google.com/p/protobuf-dt/">
diff --git a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
index 3969ddf..df7482b 100644
--- a/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.5.1.qualifier
+Bundle-Version: 1.5.3.qualifier
 Bundle-Activator: com.google.eclipse.protobuf.ui.internal.ProtobufActivator
 Bundle-SymbolicName: com.google.eclipse.protobuf.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
@@ -14,6 +14,7 @@
  org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
+ org.eclipse.jdt.core;resolution:=optional,
  org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.ui.editors,
diff --git a/com.google.eclipse.protobuf.ui/plugin.xml b/com.google.eclipse.protobuf.ui/plugin.xml
index da6eaab..12f43f3 100644
--- a/com.google.eclipse.protobuf.ui/plugin.xml
+++ b/com.google.eclipse.protobuf.ui/plugin.xml
@@ -275,4 +275,7 @@
       <newWizardShortcut id="com.google.eclipse.protobuf.ui.wizards.NewProtoFileWizard" />
     </perspectiveExtension>
   </extension>
+    <extension point="org.eclipse.xtext.ui.shared.overridingGuiceModule">
+    <module class="com.google.eclipse.protobuf.ui.SharedModuleOverrides"/>
+  </extension>
 </plugin>
\ No newline at end of file
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/SharedModuleOverrides.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/SharedModuleOverrides.java
new file mode 100644
index 0000000..e40e113
--- /dev/null
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/SharedModuleOverrides.java
@@ -0,0 +1,14 @@
+package com.google.eclipse.protobuf.ui;
+
+import com.google.eclipse.protobuf.ui.resource.ProtobufStorage2UriMapper;
+import com.google.inject.AbstractModule;
+import com.google.inject.Scopes;
+
+import org.eclipse.xtext.ui.resource.IStorage2UriMapper;
+
+public class SharedModuleOverrides extends AbstractModule {
+  @Override
+  protected void configure() {
+    bind(IStorage2UriMapper.class).to(ProtobufStorage2UriMapper.class).in(Scopes.SINGLETON);
+  }
+}
diff --git a/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/resource/ProtobufStorage2UriMapper.java b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/resource/ProtobufStorage2UriMapper.java
new file mode 100644
index 0000000..3b329c4
--- /dev/null
+++ b/com.google.eclipse.protobuf.ui/src/com/google/eclipse/protobuf/ui/resource/ProtobufStorage2UriMapper.java
@@ -0,0 +1,25 @@
+package com.google.eclipse.protobuf.ui.resource;
+
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.xtext.ui.resource.IStorage2UriMapperJdtExtensions;
+import org.eclipse.xtext.ui.resource.Storage2UriMapperImpl;
+import org.eclipse.xtext.util.Pair;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class ProtobufStorage2UriMapper extends Storage2UriMapperImpl 
+    implements IStorage2UriMapperJdtExtensions {
+  @Override
+  public Map<URI, IStorage> getAllEntries(IPackageFragmentRoot root) {
+    return Collections.emptyMap();
+  }
+
+  @Override
+  public Pair<URI, URI> getURIMapping(IPackageFragmentRoot root) throws JavaModelException {
+    return null;
+  }
+}
diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index b9c7a36..7d8fc0f 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Eclipse-ExtensibleAPI: true
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 1.5.1.qualifier
+Bundle-Version: 1.5.3.qualifier
 Bundle-SymbolicName: com.google.eclipse.protobuf; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.antlr.runtime,