diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml
index 45b0ff9dcde70aca12f212fbd1909af8f440f331..bf7b69bb682e1e0a4271ff7b79b5af045d7a376f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS-without-entry-point.gwt.xml
@@ -31,16 +31,19 @@
     <script src="demo-dictionary.js"/>
     <public path="plugin/demo/client/web/public"/>
     <source path="plugin/demo/client/web/client"/>
+    <source path="plugin/demo/shared/basic"/>
 
     <!-- Generic plugin -->
     <script src="generic-dictionary.js"/>
     <public path="plugin/generic/client/web/public"/>
     <source path="plugin/generic/client/web/client"/>
+<source path="plugin/generic/shared/basic"/>
 
     <!-- Screening plugin -->
     <script src="screening-dictionary.js"/>
     <public path="plugin/screening/client/web/public"/>
     <source path="plugin/screening/client/web/client"/>
+<source path="plugin/screening/shared/basic"/>
     <!-- Automatically generated part - END -->
 
   <!-- Do not define servlets here, use web.xml -->
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml
index bbb3c8e251a6ad749bdf159559d01a8e1914f5f5..42e1f044e6a55d3dbb8dc3a5462bfc5b94868ce0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/OpenBIS.gwt.xml
@@ -3,7 +3,5 @@
 <module>
   <inherits name='ch.systemsx.cisd.openbis.OpenBIS-without-entry-point' />
 
-  <source path="plugin/screening/shared/basic" />
-
   <entry-point class='ch.systemsx.cisd.openbis.generic.client.web.client.application.Client' />
 </module>
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
index 2392e81f9a2a751f4d09c4074f45a0cfcb1b7049..b56fd7f69c8c3e81e69a0366411f1d3d29e2e448 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/util/WebClientFilesUpdater.java
@@ -42,7 +42,9 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.Def
 public final class WebClientFilesUpdater
 {
     @Private
-    static final String SOURCE_TAG_TEMPLATE = "<source path=\"plugin/%s/client/web/client\"/>";
+    static final String SOURCE_TAG_TEMPLATE =
+            "<source path=\"plugin/%1$s/client/web/client\"/>\n"
+                    + "\t\t<source path=\"plugin/%1$s/shared/basic\"/>";
 
     @Private
     static final String SCRIPT_TAG_TEMPLATE = "<script src=\"%s-dictionary.js\"/>";