diff --git a/rtd_phosphonetx/build/build.xml b/rtd_phosphonetx/build/build.xml
index 28840a3693a069fc7de5fcb77f953967a53dcefe..9ce65028f80b45b0638ebd8d0bf66f5095be6b96 100644
--- a/rtd_phosphonetx/build/build.xml
+++ b/rtd_phosphonetx/build/build.xml
@@ -35,8 +35,8 @@
         <include name="ch/systemsx/cisd/common/api/**/*.class" />
         <exclude name="ch/systemsx/cisd/common/api/server/**/*.class" />
         <include name="ch/systemsx/cisd/openbis/plugin/phosphonetx/**/api/**/*.class" />
-        <exclude name="ch/systemsx/cisd/openbis/generic/server/api/**/*.class" />
-        <exclude name="ch/systemsx/cisd/openbis/generic/shared/api/**/*.class" />
+        <exclude name="ch/systemsx/cisd/openbis/**/server/api/**/*.class" />
+        <include name="ch/systemsx/cisd/openbis/generic/shared/api/**/*.class" />
         <include name="ch/systemsx/cisd/openbis/plugin/phosphonetx/*BuildAndEnvironmentInfo.class" />
         <include name="*.INFO" />
       </zipfileset>
@@ -47,7 +47,10 @@
     <javadoc destdir="${api.doc}" access="public" author="false" version="false" classpath="${ecp}">
       <packageset dir="${sources}">
         <include name="ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/**" />
-        <include name="ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/api/v1/dto/**" />
+        <include name="ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/api/v1/**" />
+      </packageset>
+      <packageset dir="../openbis/${sources}">
+        <include name="ch/systemsx/cisd/openbis/generic/shared/api/v1/**" />
       </packageset>
     </javadoc>
     <zip destfile="${api.doc.zip}">
@@ -55,8 +58,9 @@
     </zip>
     <delete dir="${dist}/${api.prefix}" />
     <zip destfile="${api.src.zip}">
-      <zipfileset dir="${sources}" includes="ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/api/v1/dto/**" />
-      <zipfileset dir="${sources}" includes="ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/*.java" />
+      <zipfileset dir="${sources}" includes="ch/systemsx/cisd/openbis/plugin/phosphonetx/shared/api/v1/**" />
+      <zipfileset dir="${sources}" includes="ch/systemsx/cisd/openbis/plugin/phosphonetx/client/api/v1/**" />
+      <zipfileset dir="../openbis/${sources}" includes="ch/systemsx/cisd/openbis/generic/shared/api/v1/**" />
     </zip>
   </target>