diff --git a/TBF/Build/CopyGci.targets.xml b/TBF/Build/CopyGci.targets.xml
index 030bc99b6..1431f42a7 100644
--- a/TBF/Build/CopyGci.targets.xml
+++ b/TBF/Build/CopyGci.targets.xml
@@ -1,3 +1,19 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+	<Target Name="CopyPackageCommonToTbfOutput" AfterTargets="Build">
+		<ItemGroup>
+			<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.dll" />
+			<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.exe" />
+			<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.config" />
+			<CommonPackageFiles Include="$(SolutionDir)packages\Common\*.json" />
+		</ItemGroup>
+
+		<Message Text="Copying packages\Common to TBF output: $(TargetDir)" Importance="High" />
+
+		<Copy
+		  SourceFiles="@(CommonPackageFiles)"
+		  DestinationFolder="$(TargetDir)"
+		  SkipUnchangedFiles="true" />
+	</Target>
+
 </Project>
\ No newline at end of file