diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c
index b6ea62e85..76b7a8abf 100644
--- a/src/frontend/outitf.c
+++ b/src/frontend/outitf.c
@@ -826,6 +826,12 @@ fileInit_pass2(runDesc *run)
             type = SV_RES;
         else if ((*name == '@') && (substring("[g", name)))
             type = SV_ADMITTANCE;
+        else if ((*name == '@') && (substring("[c", name)))
+            type = SV_CAPACITANCE;
+        else if ((*name == '@') && (substring("[i", name)))
+            type = SV_CURRENT;
+        else if ((*name == '@') && (substring("[q", name)))
+            type = SV_CHARGE;
         else
             type = SV_VOLTAGE;
 
@@ -992,6 +998,12 @@ plotInit(runDesc *run)
             v->v_type = SV_RES;
         else if ((*(v->v_name) == '@') && (substring("[g", v->v_name)))
             v->v_type = SV_ADMITTANCE;
+        else if ((*(v->v_name) == '@') && (substring("[c", v->v_name)))
+            v->v_type = SV_CAPACITANCE;
+        else if ((*(v->v_name) == '@') && (substring("[i", v->v_name)))
+            v->v_type = SV_CURRENT;
+        else if ((*(v->v_name) == '@') && (substring("[q", v->v_name)))
+            v->v_type = SV_CHARGE;
         else
             v->v_type = SV_VOLTAGE;
         v->v_length = 0;
diff --git a/src/frontend/typesdef.c b/src/frontend/typesdef.c
index 5f95172fa..68e795b3e 100644
--- a/src/frontend/typesdef.c
+++ b/src/frontend/typesdef.c
@@ -50,7 +50,8 @@ struct type types[NUMTYPES] = {
     { "power", "W" } ,            /* Added by A.Roldan */
     { "phase", "Degree" } ,       /* Added by A.Roldan */
     { "decibel", "dB" } ,         /* Added by A.Roldan */
-
+    { "capacitance", "F" } ,
+    { "charge", "C" } ,
 };
 
 /* The stuff for plot names. */
diff --git a/src/include/ngspice/sim.h b/src/include/ngspice/sim.h
index 340ed86b3..76e4f54bb 100644
--- a/src/include/ngspice/sim.h
+++ b/src/include/ngspice/sim.h
@@ -18,7 +18,11 @@ enum simulation_types {
   SV_RES,
   SV_IMPEDANCE,
   SV_ADMITTANCE,
-  SV_POWER
+  SV_POWER,
+  SV_PHASE,
+  SV_DB,
+  SV_CAPACITANCE,
+  SV_CHARGE
 };
 
 #endif