diff --git a/ChangeLog b/ChangeLog
index a09ea27f8..8b49daf1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,14 @@
+2009-03-07 Holger Vogt
+  * inpcom.c fcn inp_fix_for_numparam(): no quotes changed for plot lines within
+    control section, e.g. plot v(2) xlabel 'my input' ylabel 'output'
+
 2009-03-07 Dietmar Warning
  * tests/bsim4/*.out: same as below for bsim3
 
 2009-03-07 Holger Vogt
   * spicenum.c inpcom.c subckt.c xpressn.c numpaif.h numparam.h general.h
     Collect information to allow dynamic memory allocation for numparam
-    ( Still to be implementd ! )
+    ( Still to be implemented ! )
     Defined in inpcom.c: dynmaxline dynnLen dynMaxckt dynsubst
 
 2009-03-03 Dietmar Warning
diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c
index 9cd025b21..78cb7c312 100644
--- a/src/frontend/inpcom.c
+++ b/src/frontend/inpcom.c
@@ -1801,23 +1801,32 @@ inp_remove_ws( char *s )
 static void
 inp_fix_for_numparam(struct line *deck)
 {
-    struct line *c=deck;
-    while( c!=NULL) {
+   bool found_control = FALSE;
+   struct line *c=deck;
+   while( c!=NULL) {
       if ( ciprefix( ".modif", c->li_line ) ) *c->li_line = '*';
       if ( ciprefix( "*lib", c->li_line ) ) {
-	c = c->li_next;
-	continue;
+         c = c->li_next;
+         continue;
       }
+ 
+      /* exclude plot line between .control and .endc from getting quotes changed */
+      if ( ciprefix( ".control", c->li_line ) ) found_control = TRUE;
+      if ( ciprefix( ".endc",    c->li_line ) ) found_control = FALSE; 
+      if ((found_control) && (ciprefix( "plot", c->li_line ))) {
+         c = c->li_next;
+         continue;
+      }      	 
       
       if ( !ciprefix( "*lib", c->li_line ) && !ciprefix( "*inc", c->li_line ) )
-	inp_change_quotes(c->li_line);
+         inp_change_quotes(c->li_line);
 
       if ( ciprefix( ".subckt", c->li_line ) ) {
-	c->li_line = inp_fix_subckt(c->li_line);
+         c->li_line = inp_fix_subckt(c->li_line);
       }
 
-      c= c->li_next;
-    }
+      c = c->li_next;
+   }
 }
 
 static void