diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle
index 952f2dda7f29100278d9d0562db02e012f35dd0c..202f8b8f6c26f7b7a72f886c0be4c73d3ff2597e 100644
--- a/gradle/javaproject.gradle
+++ b/gradle/javaproject.gradle
@@ -291,7 +291,12 @@ eclipse.classpath.file {
         def projectRefs = classpath.entries.findAll{entry -> entry.kind =='src' && entry.path.startsWith('/')}
         classpath.entries.removeAll(projectRefs)
         classpath.entries.addAll(projectRefs)   
-    }   
+		
+		gwtlib = classpath.entries.findAll {entry -> entry.path.contains('gwt-user')}
+		if (gwtlib.size() == 1) {
+			gwtlib.get(0).path = gwtlib.get(0).path.replace('gwt-user', 'gwt-user-eclipse')
+		}
+    }
 }
 
 task testJar(type: Jar, dependsOn: testClasses) {