--- a/sbsv2/raptor/lib/flm/taggedrules.mk	Fri Feb 26 14:51:57 2010 +0000
+++ b/sbsv2/raptor/lib/flm/taggedrules.mk	Sun Feb 28 21:19:57 2010 +0200
@@ -99,10 +99,17 @@
 
 
 else
+
+  ifneq ($(filter win,$(HOST_PLATFORM)),)
+    TALON_HOSTNAME_VAR:=$$COMPUTERNAME
+  else
+    TALON_HOSTNAME_VAR:=$$HOSTNAME
+  endif
+
 TALON_RECIPEATTRIBUTES:=\
  name='$$RECIPE'\
  target='$$TARGET'\
- host='$$HOSTNAME'\
+ host='$(TALON_HOSTNAME_VAR)'\
  layer='$$COMPONENT_LAYER'\
  component='$$COMPONENT_NAME'\
  bldinf='$$COMPONENT_META' mmp='$$PROJECT_META'\