diff -r af20ebf91ca6 -r fcee787f22fe symbian4/os/lbs/package_definition.xml
--- a/symbian4/os/lbs/package_definition.xml	Tue May 18 12:43:11 2010 +0100
+++ b/symbian4/os/lbs/package_definition.xml	Wed May 19 10:37:39 2010 +0100
@@ -93,8 +93,8 @@
           <component name="networkpositioningmodule" long-name="Network Positioning Module" introduced="^3" purpose="optional" plugin="Y">
             <unit bldFile="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group" mrp="/sf/os/lbs/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp"/>
           </component>
-          <component name="locationapesuplpsy" long-name="APE SUPL PSY" introduced="^3" purpose="optional" filter="s60" plugin="Y">
-            <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group"/>
+          <component name="locationapesuplpsy" long-name="APE SUPL Positioning Module" introduced="^3" purpose="optional" plugin="Y">
+            <unit bldFile="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group" mrp="/sf/os/lbs/datasourcemodules/locationapesuplpsy/group/lbs_ape_supl_positioning_module.mrp"/>
           </component>
         </collection>
         <collection name="datasourceadaptation" long-name="Data Source Adaptation" level="adaptation">
@@ -139,10 +139,22 @@
           <component name="privacyprotocolmodule" long-name="Privacy Protocol Module" introduced="^2" purpose="optional" plugin="Y">
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group" mrp="/sf/os/lbs/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp"/>
           </component>
+          <component name="suplproxyprotocolmodule" long-name="SUPL Proxy Protocol Module" introduced="^3" purpose="optional" plugin="Y">
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp"/>
+          </component>
+          <component name="suplprotocolmodule" long-name="SUPL Protocol Module" introduced="^2" deprecated="^2" purpose="optional" plugin="Y">
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/sfgroup" mrp="/sf/os/lbs/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp"/>
+          </component>
           <component name="suplrrlpasn1" filter="sf_build" long-name="SUPL RRLP ASN1 Parser">
             <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
             <unit bldFile="/sf/os/lbs/networkprotocolmodules/common/suplrrlpasn1/group"/>
           </component>
+          <component name="suplrrlpprotocol" long-name="SUPL RRLP Protocol Module">
+            <!-- hack for Foundation builds needed while collection is reorganised into proper components -->
+            <unit bldFile="/sf/os/lbs/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup"/>
+          </component>
         </collection>
         <collection name="lbsapitest" long-name="Location API Tests" level="application-interface">
           <component name="lbshaitest" long-name="Location HAI Tests" introduced="^2" purpose="development" filter="test">