--- a/appfw/apparchitecture/group/APSERV.MMP	Mon May 03 12:40:23 2010 +0300
+++ b/appfw/apparchitecture/group/APSERV.MMP	Fri May 14 16:01:13 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -41,16 +41,27 @@
 source          APSSERV.CPP APSSES.CPP APSSTD.CPP APSSCAN.CPP
 source          APSSTART.CPP APSRECCACHE.cpp APSRECUTIL.CPP
 source	        APSCONSTDATA.CPP
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 source          apsnnapps.cpp apsnnappupdates.cpp
+#endif
 
 
 library         euser.lib efsrv.lib apparc.lib apgrfx.lib apmime.lib fbscli.lib apfile.lib
 library         estor.lib bafl.lib ws32.lib ecom.lib
 library		aplist.lib
 
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+library		scrclient.lib
+library		sisregistryclient.lib
+#endif
+
 macro UI_FRAMEWORKS_V1_REMNANT_FOR_JAVA_MIDLET_INSTALLER
 
-deffile 	APSERV.DEF
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+	deffile APSERV.DEF
+#else
+	deffile apserv_legacy.def
+#endif
 
 START WINS
 	baseaddress	0x43700000