diff -ruN cfengine-2.0.5-old/src/cfrun.c cfengine-2.0.5/src/cfrun.c
--- cfengine-2.0.5-old/src/cfrun.c	2003-02-16 13:21:07.000000000 +0000
+++ cfengine-2.0.5/src/cfrun.c	2003-03-03 16:39:28.000000000 +0000
@@ -560,16 +560,23 @@
   struct Item *ip; 
 
 bzero(filename,bufsize);
-  
-if (((sp=getenv(CFINPUTSVAR)) != NULL) && (!strchr(VCFRUNHOSTS, '/')))
+
+if (!strchr(VCFRUNHOSTS, '/'))
    {
-   strcpy(filename,sp);
-   if (filename[strlen(filename)-1] != '/')
+   if ((sp=getenv(CFINPUTSVAR)) != NULL)
       {
-      strcat(filename,"/");
+      strcpy(filename,sp);
+      if (filename[strlen(filename)-1] != '/')
+         {
+         strcat(filename,"/");
+         }
+      }
+   else
+      {
+      snprintf(filename, bufsize, "%s/inputs/", WORKDIR);
       }
    }
-
+ 
 strcat(filename,VCFRUNHOSTS);
 
 if ((fp = fopen(filename,"r")) == NULL)      /* Open root file */