diff --git a/circuit/ael/mr/mr_jfet.ael b/circuit/ael/mr/mr_jfet.ael
new file mode 100644
index 0000000..9ca3d5c
--- /dev/null
+++ b/circuit/ael/mr/mr_jfet.ael
@@ -0,0 +1,195 @@
+create_item
+(   
+    "mr_jfet_n",                        // name
+    "JFET Transistor, N",               // label
+    "Q",                                // prefix
+    0,                                  // attributes
+    NULL,                               // priority
+    NULL,                               // icon name
+    standard_dialog,                    // dialog name
+    "*",                                // dialog data
+    CmpModelNetlistFmt,                 // netlist format string
+    "JFET",                             // netlist data (model name)
+    ComponentAnnotFmt,                  // display format string
+    NULL,                               // symbol name  (not used)
+    NULL,                               // artwork type (not used)
+    NULL,                               // artwork data (not used)
+    ITEM_PRIMITIVE_EX,                  // extra attributes
+
+create_parm
+    (
+        "Model",
+        "Model instance name", 
+        0,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","")
+    ),
+
+    create_parm
+    (
+        "Area",
+        "Scaling Factor, (default: 1.0)",
+        PARM_OPTIMIZABLE | PARM_STATISTICAL | PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","")
+    ),
+
+    create_parm
+    (
+        "Region",
+        "DC operating region, 0=off, 1=on, 2=rev, 3=sat, (default: on)",
+        PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","1")
+    ),
+
+    create_parm
+    (
+        "Temp",
+        "Device operating temperature, (default: 25)",
+        PARM_OPTIMIZABLE | PARM_STATISTICAL | PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        TEMPERATURE_UNIT,
+        prm("StdForm","25")
+    ),
+
+    create_parm
+    (
+        "Trise",
+        "Temperature rise over ambient",
+        PARM_OPTIMIZABLE | PARM_STATISTICAL | PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        TEMPERATURE_UNIT,
+        prm("StdForm","0")
+    ),
+
+    create_parm
+    (
+        "Mode",
+        "Simulation Mode for This Device, (default: NONLINEAR)",
+        PARM_NO_DISPLAY,
+        "simtype_mode",
+        UNITLESS_UNIT,
+        prm("simtype_nonlin","")
+    ),
+
+    create_parm
+    (
+        "Noise",
+        "Noise generation option; yes=1, no=0 ( default: yes ) ",
+        PARM_NO_DISPLAY,
+        "sim_enum_on_off_list_form",
+        UNITLESS_UNIT,prm("Yes","yes")
+    ),
+
+    create_parm
+    (
+        "_M",
+        "Number of devices in parallel, (default: 1)", 
+        PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","1")
+    ) 
+);    
+
+create_item
+(   
+    "mr_jfet_p",                        // name
+    "JFET Transistor, P",               // label
+    "Q",                                // prefix
+    0,                                  // attributes
+    NULL,                               // priority
+    NULL,                               // icon name
+    standard_dialog,                    // dialog name
+    "*",                                // dialog data
+    CmpModelNetlistFmt,                 // netlist format string
+    "JFET",                             // netlist data (model name)
+    ComponentAnnotFmt,                  // display format string
+    NULL,                               // symbol name  (not used)
+    NULL,                               // artwork type (not used)
+    NULL,                               // artwork data (not used)
+    ITEM_PRIMITIVE_EX,                  // extra attributes
+
+create_parm
+    (
+        "Model",
+        "Model instance name", 
+        0,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","")
+    ),
+
+    create_parm
+    (
+        "Area",
+        "Scaling Factor, (default: 1.0)",
+        PARM_OPTIMIZABLE | PARM_STATISTICAL | PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","")
+    ),
+
+    create_parm
+    (
+        "Region",
+        "DC operating region, 0=off, 1=on, 2=rev, 3=ohmic, (default: on)",
+        PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","1")
+    ),
+
+    create_parm
+    (
+        "Temp",
+        "Device operating temperature, (default: 25)",
+        PARM_OPTIMIZABLE | PARM_STATISTICAL | PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        TEMPERATURE_UNIT,
+        prm("StdForm","")
+    ),
+
+    create_parm
+    (
+        "Trise",
+        "Temperature rise over ambient",
+        PARM_OPTIMIZABLE | PARM_STATISTICAL | PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        TEMPERATURE_UNIT,
+        prm("StdForm","0")
+    ),
+
+    create_parm
+    (
+        "Mode",
+        "Simulation Mode for This Device, (default: NONLINEAR)",
+        PARM_NO_DISPLAY,
+        "simtype_mode",
+        UNITLESS_UNIT,
+        prm("simtype_nonlin","")
+    ),
+
+    create_parm
+    (
+        "Noise",
+        "Noise generation option; yes=1, no=0 ( default: yes ) ",
+        PARM_NO_DISPLAY,
+        "sim_enum_on_off_list_form",
+        UNITLESS_UNIT,prm("Yes","yes")
+    ),
+
+    create_parm
+    (
+        "_M",
+        "Number of devices in parallel, (default: 1)", 
+        PARM_NO_DISPLAY,
+        "StdFileFormSet",
+        UNITLESS_UNIT,
+        prm("StdForm","1")
+    ) 
+);    
diff --git a/circuit/models/jfet/plp/BF245B.mod b/circuit/models/jfet/plp/BF245B.mod
new file mode 100644
index 0000000..3874590
--- /dev/null
+++ b/circuit/models/jfet/plp/BF245B.mod
@@ -0,0 +1,19 @@
+define BF245B_PLP(1 2 3)
+
+	BF245B	:J	1	2	3
+
+	model BF245B JFET			\
+		NFET	= yes			\
+		PFET	= no			\
+		Vto		= -4.10850E+000	\
+		Beta	=  1.09045E-003	\
+		Lambda	=  2.31754E-002	\
+		Rd		=  7.77648E+000	\
+		Rs		=  7.77648E+000	\
+		Is		=  2.59121E-016	\
+		Cgs		=  2.00000E-012	\
+		Cgd		=  2.20000E-012	\
+		Pb		=  9.91494E-001	\
+		Fc		=  5.00000E-001
+
+end BF245B_PLP
\ No newline at end of file
diff --git a/de/ael/boot.ael b/de/ael/boot.ael
index f93f542..1a8689f 100644
--- a/de/ael/boot.ael
+++ b/de/ael/boot.ael
@@ -43,5 +43,6 @@ load( strcat( MRMODELS_DIR_CIRCUIT_AEL, "mrmodels_include"));
 
 load( strcat( MRMODELS_DIR_CIRCUIT_AEL, "mr/mr_resistor"    ));
 load( strcat( MRMODELS_DIR_CIRCUIT_AEL, "mr/mr_bjt"         ));
+load( strcat( MRMODELS_DIR_CIRCUIT_AEL, "mr/mr_jfet"        ));
 
 
diff --git a/mrModels/mr_jfet_n/symbol/master.tag b/mrModels/mr_jfet_n/symbol/master.tag
new file mode 100644
index 0000000..e1024da
--- /dev/null
+++ b/mrModels/mr_jfet_n/symbol/master.tag
@@ -0,0 +1,2 @@
+-- Master.tag File, Rev:1.0
+symbol.oa
diff --git a/mrModels/mr_jfet_n/symbol/symbol.oa b/mrModels/mr_jfet_n/symbol/symbol.oa
new file mode 100644
index 0000000..aa3f66d
Binary files /dev/null and b/mrModels/mr_jfet_n/symbol/symbol.oa differ
diff --git a/mrModels/mr_jfet_p/symbol/master.tag b/mrModels/mr_jfet_p/symbol/master.tag
new file mode 100644
index 0000000..e1024da
--- /dev/null
+++ b/mrModels/mr_jfet_p/symbol/master.tag
@@ -0,0 +1,2 @@
+-- Master.tag File, Rev:1.0
+symbol.oa
diff --git a/mrModels/mr_jfet_p/symbol/symbol.oa b/mrModels/mr_jfet_p/symbol/symbol.oa
new file mode 100644
index 0000000..c7b48be
Binary files /dev/null and b/mrModels/mr_jfet_p/symbol/symbol.oa differ
diff --git a/mrModels/test3/schematic/master.tag b/mrModels/test3/schematic/master.tag
new file mode 100644
index 0000000..26be1be
--- /dev/null
+++ b/mrModels/test3/schematic/master.tag
@@ -0,0 +1,2 @@
+-- Master.tag File, Rev:1.0
+sch.oa
diff --git a/mrModels/test3/schematic/sch.oa b/mrModels/test3/schematic/sch.oa
new file mode 100644
index 0000000..2cc0d4f
Binary files /dev/null and b/mrModels/test3/schematic/sch.oa differ