diff --git a/src/res/eressea/de/strings.xml b/src/res/eressea/de/strings.xml
index bc2366fbf..f32e74252 100644
--- a/src/res/eressea/de/strings.xml
+++ b/src/res/eressea/de/strings.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <strings>
+  <namespace name="race">
+    <string name="snowman">
+      <text locale="de">Schneemann</text>
+      <text locale="en">snowman</text>
+    </string>
+    <string name="snowman_p">
+      <text locale="de">Schneemänner</text>
+      <text locale="en">snowmen</text>
+    </string>
+  </namespace>
   <namespace name="iteminfo">
     <string name="seashell">
       <text locale="en">
diff --git a/src/res/eressea/items.xml b/src/res/eressea/items.xml
index d853a4e34..ca04dea9c 100644
--- a/src/res/eressea/items.xml
+++ b/src/res/eressea/items.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0"?>
 <resources>
 
+<!-- xmas gimmicks -->
+  <resource name="snowball">
+    <item notlost="yes" weight="0">
+      <function name="use" value="lua_useitem"/>
+    </item>
+  </resource>
+
+  <resource name="snowman">
+    <item notlost="yes" weight="1">
+      <function name="use" value="lua_useitem"/>
+    </item>
+  </resource>
+
 <!-- ambassador rewards -->
   <resource name="seashell">
     <item cursed="true" weight="0">
diff --git a/src/res/eressea/races.xml b/src/res/eressea/races.xml
index 590caec2d..5faa77c2b 100644
--- a/src/res/eressea/races.xml
+++ b/src/res/eressea/races.xml
@@ -1,2 +1,10 @@
 <races>
+  <race name="snowman" magres="0.800000" maxaura="0.000000"
+        regaura="0.000000" weight="500" capacity="200" equipment="no"
+        speed="1.000000" hp="20" ac="4" damage="2d4" unarmedattack="10"
+        unarmeddefense="10" attackmodifier="8" defensemodifier="8"
+        fly="no" walk="no" teach="no" getitem="no">
+    <attack type="4" damage="2d6+2"/>
+    <attack type="3" damage="2d6+2"/>
+  </race>
 </races>
diff --git a/src/res/resources.xml b/src/res/resources.xml
index 7c2194c9e..87deee2b7 100644
--- a/src/res/resources.xml
+++ b/src/res/resources.xml
@@ -53,18 +53,6 @@
     </item>
   </resource>
 
-  <resource name="snowball">
-    <!-- xmas gimmik -->
-    <item notlost="yes" weight="0">
-      <function name="use" value="usesnowball"/>
-    </item>
-  </resource>
-
-  <resource name="snowman">
-    <!-- xmas gimmik -->
-    <item notlost="yes" weight="1"/>
-  </resource>
-
 <!-- items -->
   <resource name="seed" limited="yes">
     <item weight="10" score="50">
diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua
index c7c096b26..e8eed57af 100644
--- a/src/scripts/eressea.lua
+++ b/src/scripts/eressea.lua
@@ -29,6 +29,7 @@ function run_scripts()
     "eressea/eternath.lua",
     "eressea/wedding-jadee.lua", 
     "eressea/ponnuki.lua",
+    "eressea/xmas2004.lua",
     "eressea/xmas2005.lua",
     "eressea/embassy.lua"
   }
diff --git a/src/scripts/eressea/xmas2004.lua b/src/scripts/eressea/xmas2004.lua
index a77cc3882..0a6e8da95 100644
--- a/src/scripts/eressea/xmas2004.lua
+++ b/src/scripts/eressea/xmas2004.lua
@@ -1,8 +1,17 @@
+function use_snomwan(u, amount)
+  if u.region.terrain == "glacier" then
+    local man = add_unit(u.faction, u.region)
+    u.race = "snowman"
+    u.number = amount
+    u:add_item("snowman", -amount)
+  end
+end
+
 function xmas2004()
   print(get_gamename())
   if get_gamename() == "Eressea" then
     if not get_flag("xm04") then
-      print("Es weihnachtet sehr")
+      print("Es weihnachtet sehr (2004)")
       set_flag("xm04", true)
       for f in factions() do
         f:add_item("speedsail", 1)
@@ -12,5 +21,4 @@ function xmas2004()
   end
 end
 
-print("Ja, ist denn schon Weihnachten?")
 xmas2004()
diff --git a/src/scripts/eressea/xmas2005.lua b/src/scripts/eressea/xmas2005.lua
index 74699398b..0c8b779d4 100644
--- a/src/scripts/eressea/xmas2005.lua
+++ b/src/scripts/eressea/xmas2005.lua
@@ -17,7 +17,7 @@ function xmas2005()
   print(get_gamename())
   if get_gamename() == "Eressea" then
     if not get_flag("xm05") then
-      print("Es weihnachtet sehr")
+      print("Es weihnachtet sehr (2005)")
       set_flag("xm05", true)
       for f in factions() do
         f:add_item("stardust", 1)
@@ -27,5 +27,4 @@ function xmas2005()
   end
 end
 
-print("Ja, ist denn schon wieder Weihnachten?")
 xmas2005()