diff --git a/ChangeLog b/ChangeLog
index 1945f8f8b..dcaa1ecf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-04  Paolo Nenzi <p.nenzi@ieee.org>
+
+ *   src/spicelib/devices/bsim4/b4ld.c: As written by Dietmar, the changes 
+     introduced into this file around line 4015 - 4020 are wrong. Back to
+     original Berkeley's code.
+
 2005-12-02  Paolo Nenzi <p.nenzi@ieee.org>
 
  *  src/maths/cmaths/test_cx_ph.c: added a missing include 
diff --git a/src/spicelib/devices/bsim4/b4ld.c b/src/spicelib/devices/bsim4/b4ld.c
index ebbfa9d2b..519b357af 100644
--- a/src/spicelib/devices/bsim4/b4ld.c
+++ b/src/spicelib/devices/bsim4/b4ld.c
@@ -4011,14 +4011,14 @@ line755:
                         * pParam->BSIM4leffCV;
                   T0 = qdef * ScalingFactor / CoxWL;
                   ggtg = here->BSIM4gtg = T0 * here->BSIM4gcrgg;
-                  ggts = here->BSIM4gts = T0 * here->BSIM4gcrgs;
-                  ggtd = here->BSIM4gtd = T0 * here->BSIM4gcrgd;
+                  ggts = here->BSIM4gts = T0 * here->BSIM4gcrgd;
+                  ggtd = here->BSIM4gtd = T0 * here->BSIM4gcrgs;
                   ggtb = here->BSIM4gtb = T0 * here->BSIM4gcrgb;
 		  gqdef = ScalingFactor * ag0;
 
                   gcqgb = here->BSIM4cqgb * ag0;
-                  gcqdb = here->BSIM4cqdb * ag0;
-                  gcqsb = here->BSIM4cqsb * ag0;
+                  gcqdb = here->BSIM4cqsb * ag0;
+                  gcqsb = here->BSIM4cqdb * ag0;
                   gcqbb = here->BSIM4cqbb * ag0;
 
                   if (fabs(qcheq) <= 1.0e-5 * CoxWL)