diff --git a/openbis/build/build.xml b/openbis/build/build.xml
index d4dd8f000b78a23c23db7e22effa312a1d3f153f..bfc7113983c55e07ee1c2e7bba20c4c2bf0b06ca 100644
--- a/openbis/build/build.xml
+++ b/openbis/build/build.xml
@@ -400,13 +400,16 @@
 				<exclude name="**/shared/dto/*PE.class"/>
 				<include name="**/shared/authorization/annotation/*.class"/>
 				<include name="**/shared/authorization/ISessionProvider.class"/>
-				<include name="**/BuildAndEnvironmentInfo.class"/>
-				<include name="${build.info.filename}" />
+				<include name="**/*BuildAndEnvironmentInfo.class"/>
+				<include name="*.INFO" />
 			</zipfileset>
 			<zipfileset src="${lib}/gwt2.0/gwt-user.jar">
 				<include name="com/google/gwt/user/client/rpc/IsSerializable.class"/>
 				<include name="com/google/gwt/user/client/rpc/SerializableException.class"/>
 			</zipfileset>
+			<zipfileset src="${lib}/cisd-base/cisd-base.jar">
+				<include name="**/*BuildAndEnvironmentInfo.class"/>
+			</zipfileset>
 			<manifest>
 			  <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.BuildAndEnvironmentInfo"/>
 			</manifest>