diff --git a/SConscript b/SConscript
index 8513e235ae8e181f4333eac26f0d700787525433..923f14cec40c86e9d704ae944154dbcd21eb8cdf 100644
--- a/SConscript
+++ b/SConscript
@@ -33,5 +33,8 @@ libxform=SConscript("xform/SConscript", variant_dir='scons_build/libxform')
 libtransform=SConscript("libtransform/SConscript", variant_dir='scons_build/libtransform')
 libIRDB=SConscript("libIRDB/SConscript", variant_dir='scons_build/libIRDB')
 SConscript("tools/SConscript", variant_dir='scons_build/tools')
-if int(env['build_appfw'])==1:
+
+build_appfw=ARGUMENTS.get("build_appfw", None)
+if build_appfw is None or int(build_appfw)==1:
 	SConscript("appfw/SConscript", variant_dir='scons_build/appfw')
+#if ARGUMENTS.get("build_appfw", None) is None or int(env['build_appfw'])==1:
diff --git a/SConstruct b/SConstruct
index 0b223f57546e32c2a6e27aa82f52310ec5a9c98c..80bdf75fbf68f828543b4b962b456adfc6bd75df 100644
--- a/SConstruct
+++ b/SConstruct
@@ -13,11 +13,11 @@ env.Replace(LINKFLAGS="-fPIC -w ")
 env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
 env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",None))
 env.Replace(debug=ARGUMENTS.get("debug",0))
-env.Replace(build_appfw=ARGUMENTS.get("build_appfw", None))
+#env.Replace(build_appfw=ARGUMENTS.get("build_appfw", None))
 
 # by default, turn on build of appfw
-if env['build_appfw'] is None:
-	env['build_appfw'] = 1
+#if env['build_appfw'] is None:
+#	env['build_appfw'] = 1
 
 if int(env['debug']) == 1:
         print "Setting debug mode"