diff --git a/ChangeLog b/ChangeLog
index 3becf34f3..54fe9fb65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-02-28  Paolo Nenzi <p.nenzi@ieee.org>
+
+	*   DEVICES: Updated (again) changing BSIM4 level from 60 to 14 since
+	    older model revisions are not yet in ngspice. This is consistent
+	    with model developers: newer models are compatible with older ones.
+	    
+	*   src/spicelib/devices/bsim4/: updated to revision 4.4.0 with "m"
+	    parallel multiplier enhancements. Thanks to Mick Tooher
+	    <micktooher@yahoo.com> and Dietmar Warning <warning@danalyse.de> for
+	    this update.
+	
+	*   tests/bsim4/: updated test files for bsim4 4.4.0. The old files have
+	    been replaced with new ones coming from BSIM4 site.  There are new
+	    tests: (*_gedl*) and ro_17.cir.         
+
+2005-02-25  Paolo Nenzi <p.nenzi@ieee.org>
+
+	*   DEVICES: Dietmar Warning (warning@danalyse.de) provided me an
+	    updated and corrected version of this file.
+
 2005-02-08  Paolo Nenzi <p.nenzi@ieee.org>
 
 	*   src/frontend/subckt.c: modified the file with the one supplied by
diff --git a/DEVICES b/DEVICES
index a44d837fe..a8ddbd092 100644
--- a/DEVICES
+++ b/DEVICES
@@ -359,7 +359,7 @@ JFET2   - Junction Field Effect Transistor  (PS model)
         Dir:    devices/jfet2
         Status:
 
-        This is the Parker Skellern model.
+        This is the Parker Skellern model for MESFETs.
 
         Web Site:
         http://www.elec.mq.edu.au/cnerf/models/psmodel/
@@ -374,14 +374,24 @@ JFET2   - Junction Field Effect Transistor  (PS model)
 ***************************    HFET devices     ***************************
 ***************************************************************************
 
-HFET    - HFET Level 1 (MacSpice3f4)
+   Added code from macspice3f4 HFET1&2 and MESA model 
+   Original note:
+     Added device calls for Mesfet models and HFET models
+     provided by Trond Ytterdal as of Nov 98 
+
+HFET1   - Heterostructure Field Effect Transistor Level 1
         Initial Release.
         Ver:    N/A
         Class:  Z
         Level:  5
-        Dir:    devices/hfet
+        Dir:    devices/hfet1
         Status:
 
+        This is the Heterostructure Field Effect Transistor model from:
+        K. Lee, M. Shur, T. A. Fjeldly and T. Ytterdal
+        "Semiconductor Device Modeling in VLSI", 
+        1993, Prentice Hall, New Jersey
+
         Enhancements over the original model:
 
         - Parallel multiplier
@@ -389,7 +399,7 @@ HFET    - HFET Level 1 (MacSpice3f4)
         - Added pole-zero analysis
 
 
-HFET2   - HFET Level 2 (MacSpice3f4)
+HFET2   - Heterostructure Field Effect Transistor Level 2
         Initial Release.
         Ver:    N/A
         Class:  Z
@@ -397,6 +407,8 @@ HFET2   - HFET Level 2 (MacSpice3f4)
         Dir:    devices/hfet2
         Status:
 
+        Simplified version of hfet1
+
         Enhancements over the original model:
 
         - Parallel multiplier
@@ -408,7 +420,7 @@ HFET2   - HFET Level 2 (MacSpice3f4)
 ***************************     MES devices     ***************************
 ***************************************************************************
 
-MES     - MESfet model
+MES     - MESFET model
         Initial Release.
         Ver:    N/A
         Class:  Z
@@ -416,13 +428,20 @@ MES     - MESfet model
         Dir:    devices/mes
         Status:
 
+        This is the original spice3 MESFET model (Statz).
+
         Enhancements over the original model:
 
         - Parallel multiplier
         - Alan Gillespie junction diodes implementation
 
 
-MESA    - MESA model (MacSpice3f4)
+   Added code from macspice3f4 HFET1&2 and MESA model 
+   Original note:
+     Added device calls for Mesfet models and HFET models
+     provided by Trond Ytterdal as of Nov 98 
+
+MESA    - MESFET model (MacSpice3f4)
         Initial Release.
         Ver:    N/A
         Class:  Z
@@ -618,9 +637,9 @@ BSIM3 - BSIM model level 3
 
 BSIM4   - BSIM model level 4 (0.18 um)
         Initial Release.
-        Ver:    4.2.1 (Updated in rework 14)
+        Ver:    4.4.0
         Class:  M
-        Level:  60
+        Level:  14
         Dir:    devices/bsim4
         Status: TO BE TESTED
 
@@ -630,7 +649,7 @@ BSIM4   - BSIM model level 4 (0.18 um)
         Web site:
         http://www-device.eecs.berkeley.edu/~bsim3/bsim4.html
 
-        *) Rework 14: Updated to 4.21 YET UNTESTED.
+        Updated to 4.4.0 YET UNTESTED.
 
 
 HiSIM   - Hiroshima-university STARC IGFET Model