Index: sc_druid.cpp
===================================================================
--- sc_druid.cpp	(revision 15205)
+++ sc_druid.cpp	(working copy)
@@ -5779,9 +5779,11 @@
 {
   double h = player_t::composite_attack_haste();

-  // TODO: Is the additional haste multiplicative?
   if ( buff.bear_form -> up() )
-    h *= 1.0 / ( 1.0 + gear.haste_rating * buff.bear_form -> data().effectN( 4 ).percent() / rating.attack_haste );
+  {
+    h /= 1.0 + gear.haste_rating / rating.attack_haste;
+    h *= 1.0 + gear.haste_rating * 1.5 / rating.attack_haste;
+  }

   return h;
 }
@@ -5792,9 +5794,8 @@
 {
   double c = player_t::composite_attack_crit( w );

-  // TODO: Is the additional crit multiplicative?
   if ( buff.bear_form -> up() )
-    c *= 1.0 + gear.crit_rating * buff.bear_form -> data().effectN( 4 ).percent() / rating.attack_crit;
+    c += gear.crit_rating * 0.5 / rating.attack_crit;

   return c;
 }
@@ -5929,9 +5930,11 @@
 {
   double h = player_t::composite_spell_haste();

-  // TODO: Is the additional haste multiplicative?
   if ( buff.bear_form -> up() )
-    h *= 1.0 / ( 1.0 + gear.haste_rating * buff.bear_form -> data().effectN( 4 ).percent() / rating.spell_haste );
+  {
+    h /= 1.0 + gear.haste_rating / rating.spell_haste;
+    h *= 1.0 + gear.haste_rating * 1.5 / rating.spell_haste;
+  }

   return h;
 }
@@ -5942,9 +5945,8 @@
 {
   double c = player_t::composite_spell_crit();

-  // TODO: Is the additional crit multiplicative?
   if ( buff.bear_form -> up() )
-    c *= 1.0 + gear.crit_rating * buff.bear_form -> data().effectN( 4 ).percent() / rating.spell_crit;
+    c += gear.crit_rating * 0.5 / rating.spell_crit;

   return c;
 }