diff --git a/build/mac/BuildNGLayout.pl b/build/mac/BuildNGLayout.pl
index c422e4e0fab..aad8fc6d7bb 100644
--- a/build/mac/BuildNGLayout.pl
+++ b/build/mac/BuildNGLayout.pl
@@ -29,6 +29,7 @@ use Moz;
 $DEBUG = 0;
 $ALIAS_SYM_FILES = $DEBUG;
 $CLOBBER_LIBS = 0;
+$MOZ_FULLCIRCLE = 0;
 
 $pull{all} = 0;
 $pull{lizard} = 0;
@@ -69,6 +70,12 @@ if ($build{all})
 chdir("::::");
 $MOZ_SRC = cwd();
 
+if ($MOZ_FULLCIRCLE = 1)
+{
+	#// Get the Build Number for the Master.ini(Full Circle) n'stuff
+	$buildnum = Moz::SetBuildNumber();
+}
+
 OpenErrorLog("NGLayoutBuildLog");
 #OpenErrorLog("Mozilla.BuildLog");		# Tinderbox requires that name
 
diff --git a/build/mac/NGLayoutBuildList.pm b/build/mac/NGLayoutBuildList.pm
index d9a849f5533..6964b27585b 100644
--- a/build/mac/NGLayoutBuildList.pm
+++ b/build/mac/NGLayoutBuildList.pm
@@ -142,7 +142,19 @@ sub BuildDist()
 	mkpath([ ":mozilla:dist:viewer:", ":mozilla:dist:viewer_debug:" ]);
 
 	my($distdirectory) = ":mozilla:dist";
-
+	
+	if ($MOZ_FULLCIRCLE = 1)
+	{
+		if ( $main::DEBUG )
+		{
+			mkpath([ "$distdirectory:viewer_debug:TalkBack"]);
+		} 
+		else
+		{
+			mkpath([ "$distdirectory:viewer:TalkBack"]);
+		}
+	}
+	
 	#MAC_COMMON
 	InstallFromManifest(":mozilla:build:mac:MANIFEST",								"$distdirectory:mac:common:");
 	InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST",				"$distdirectory:mac:common:");
@@ -289,6 +301,22 @@ sub BuildDist()
    InstallFromManifest(":mozilla:editor:public:MANIFEST",							"$distdirectory:editor:");
    InstallFromManifest(":mozilla:editor:txmgr:public:MANIFEST",						"$distdirectory:editor:txmgr");
 
+   #FULL CIRCLE    
+   if ($MOZ_FULLCIRCLE = 1)
+   {
+		InstallFromManifest(":ns:fullsoft:public:MANIFEST",								"$distdirectory");
+	
+		if ($main::DEBUG)
+		{
+			#InstallFromManifest(":ns:fullsoft:public:MANIFEST",						"$distdirectory:viewer_debug:");
+		} 
+		else
+		{
+			#InstallFromManifest(":ns:fullsoft:public:MANIFEST",						"$distdirectory:viewer:");
+			InstallFromManifest(":ns:fullsoft:public:MANIFEST",							"$distdirectory");
+		}
+	}
+
 	#// To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h
 	MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h",	":mozilla:dist:config:MacConfigInclude.h");
 }