diff -r acd3cd4aaceb -r 2efc27d87e1c package_definition.xml
--- a/package_definition.xml	Tue Aug 31 16:54:36 2010 +0300
+++ b/package_definition.xml	Wed Sep 01 12:36:54 2010 +0100
@@ -38,19 +38,19 @@
     </collection>
     <collection id="glib" name="GLib" level="utilities">
       <component id="glibbackend" filter="s60" name="GLib Backend">
-        <unit bldFile="glib/build/symbian/glibbackend/group"/>
+        <unit bldFile="glib/glibbackend/group"/>
       </component>
       <component id="libglib" filter="s60" name="GLib Library">
-        <unit bldFile="glib/build/symbian/glib/group"/>
+        <unit bldFile="glib/libglib/group"/>
       </component>
       <component id="libgthread" filter="s60" name="Libg Thread">
-        <unit bldFile="glib/build/symbian/gthread/group"/>
+        <unit bldFile="glib/libgthread/group"/>
       </component>
       <component id="libgmodule" filter="s60" name="Libg Module">
-        <unit bldFile="glib/build/symbian/gmodule/group"/>
+        <unit bldFile="glib/libgmodule/group"/>
       </component>
       <component id="libgobject" filter="s60" name="Libg Object">
-        <unit bldFile="glib/build/symbian/gobject/group"/>
+        <unit bldFile="glib/libgobject/group"/>
       </component>
       <component id="glib_test" filter="s60" purpose="development" name="GLib Test">
         <unit bldFile="glib/tsrc/group"/>
@@ -86,6 +86,9 @@
       </component>
     </collection>
     <collection id="stdlibs" name="Standard Libraries" level="translation">
+      <component id="libz" filter="s60" name="Z Compression Library">
+        <unit bldFile="stdlibs/libz/group"/>
+      </component>
       <component id="libcrypt" filter="s60" name="Crypt Library">
         <unit bldFile="stdlibs/libcrypt/group"/>
       </component>
@@ -136,9 +139,6 @@
       <component id="posixrealtimeextensions" name="POSIX Realtime Extensions" introduced="^3" purpose="optional">
         <unit bldFile="genericopenlibs/posixrealtimeextensions/group" mrp="genericopenlibs/posixrealtimeextensions/group/oeaddons_librt.mrp"/>
       </component>
-	  <component id="liboil" name="Liboil" introduced="^4" purpose="optional">
-        <unit bldFile="genericopenlibs/liboil/group" mrp="genericopenlibs/liboil/group/oeaddons_liboil.mrp"/>
-      </component>
     </collection>
     <collection id="lowlevellibsandfws" name="Low Level Libraries and Frameworks" level="app-libs">
       <component id="pluginfw" name="Plugin Framework" introduced="6.2" purpose="mandatory">