diff --git a/releng/org.eclipse.rse.build/build.pl b/releng/org.eclipse.rse.build/build.pl
index 00b3540a7e2..e6ed3be5a96 100644
--- a/releng/org.eclipse.rse.build/build.pl
+++ b/releng/org.eclipse.rse.build/build.pl
@@ -80,6 +80,10 @@ $incantation .= "-DbaseLocation=${eclipse} ";
 $incantation .= "-DbuildType=${buildType} ";
 $incantation .= "-DbuildId=${buildId} ";
 $incantation .= "-DmapVersionTag=${tag} ";
+if ($buildType == "N") {
+	$incantation .= "-DforceContextQualifier=${buildId} ";
+
+}
 
 print("${incantation}\n");
 
diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
index 5faf5ff46cd..cc4b777834a 100644
--- a/releng/org.eclipse.rse.build/build.rb
+++ b/releng/org.eclipse.rse.build/build.rb
@@ -60,6 +60,9 @@ command += "-DbaseLocation=#{eclipse} "
 command += "-DbuildType=#{buildType} "
 command += "-DbuildId=#{buildId} "
 command += "-DmapVersionTag=#{tag} "
+if ("#{buildType}" == "N") then
+	command += "-DforceContextQualifier=#{buildId} "
+end
 
 puts(command)
 
diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh
index e963e9ec074..5ade7b9debd 100755
--- a/releng/org.eclipse.rse.build/nightly.sh
+++ b/releng/org.eclipse.rse.build/nightly.sh
@@ -35,6 +35,7 @@ command="$command -DbuildType=${buildType} "
 command="$command -DbuildId=${buildId} "
 command="$command -DmapVersionTag=${tag} "
 command="$command -DdoPublish=true "
+command="$command -DforceContextQualifier=${buildId} "
 #command="$command postBuild "
 
 echo "$command"