diff --git a/ChangeLog b/ChangeLog
index 8b2efd775..049b35191 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-10  Holger Vogt
+ * main.c, ivars.c: environmental variable NGSPICE_INPUT_DIR
+   for additional search directory for input file
+   
 2011-07-10  Robert Larice
  * src/winmain.c ,
  * src/frontend/wdisp/winprint.c :
diff --git a/src/main.c b/src/main.c
index c7773bfcb..d5209488e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1192,7 +1192,7 @@ main(int argc, char **argv)
                 /* Copy all the arguments into the temporary file */
                 tp = fopen(arg, "r");
                 if (!tp) {
-                    char *lbuffer = getenv("NGSPICE_INPUT");
+                    char *lbuffer = getenv("NGSPICE_INPUT_DIR");
                     if (lbuffer && *lbuffer) {
                         char *p =
                             TMALLOC(char, strlen(lbuffer) + strlen(DIR_PATHSEP) + strlen(arg) + 1);
diff --git a/src/misc/ivars.c b/src/misc/ivars.c
index 04e3b1ce5..ac9c2a639 100644
--- a/src/misc/ivars.c
+++ b/src/misc/ivars.c
@@ -84,8 +84,8 @@ ivars(char *argv0)
     /* get directory where ngspice resides */
     ngpath = ngdirname(argv0);
     /* set path either to <ngspice-directory>/input or, if set, to
-    environment variable NGSPICE_INPUT */
-    mkvar(&Inp_Path, ngpath, "input", "NGSPICE_INPUT");
+    environment variable NGSPICE_INPUT_DIR */
+    mkvar(&Inp_Path, ngpath, "input", "NGSPICE_INPUT_DIR");
 
     env_overr(&Spice_Host, "SPICE_HOST"); /* aspice */
     env_overr(&Bug_Addr, "SPICE_BUGADDR");