diff --git a/vpi/sys_fileio.c b/vpi/sys_fileio.c
index 387a5ea5a..ef9de8c24 100644
--- a/vpi/sys_fileio.c
+++ b/vpi/sys_fileio.c
@@ -494,7 +494,84 @@ static PLI_INT32 sys_ungetc_sizetf(PLI_BYTE8*x)
       return 32;
 }
 
+/* $feof() is from 1364-2005. */
+static PLI_INT32 sys_feof_compiletf(PLI_BYTE8 *ud)
+{
+      vpiHandle callh = vpi_handle(vpiSysTfCall, 0);
+      vpiHandle argv = vpi_iterate(vpiArgument, callh);
+      vpiHandle item;
+      PLI_INT32 type;
 
+      /* Check that there is an argument. */
+      if (argv == 0) {
+	    vpi_printf("ERROR: %s requires an argument.\n", ud);
+	    vpi_control(vpiFinish, 1);
+	    return 0;
+      }
+      /* Check that the file descriptor is the right type. */
+      item = vpi_scan(argv);
+      type = vpi_get(vpiType, item);
+      switch (type) {
+	    case vpiReg:
+	    case vpiRealVal:
+	    case vpiIntegerVar:
+	      break;
+	    default:
+	      vpi_printf("ERROR: %s fd parameter must be integral", ud);
+	      vpi_printf(", got vpiType=%d\n", type);
+	      vpi_control(vpiFinish, 1);
+	      return 0;
+      }
+
+      /* Check that there is at most one argument. */
+      item = vpi_scan(argv);
+      if (item != 0) {
+	    vpi_printf("ERROR: %s takes a single argument.\n", ud);
+	    vpi_control(vpiFinish, 1);
+	    return 0;
+      }
+
+      /* vpi_scan returning 0 (NULL) has already freed argv. */
+      return 0;
+}
+
+static PLI_INT32 sys_feof_calltf(PLI_BYTE8 *ud)
+{
+      vpiHandle callh = vpi_handle(vpiSysTfCall, 0);
+      vpiHandle argv = vpi_iterate(vpiArgument, callh);
+      vpiHandle item = vpi_scan(argv);;
+      s_vpi_value val;
+      PLI_INT32 fd;
+      FILE *fp;
+
+      /* Get the file pointer. */
+      vpi_free_object(argv);
+      val.format = vpiIntVal;
+      vpi_get_value(item, &val);
+      fd = val.value.integer;
+      if (IS_MCD(fd)) {
+	    vpi_printf("ERROR: %s cannot be used with a MCD.\n", ud);
+	    vpi_control(vpiFinish, 1);
+	    return 0;
+      }
+      fp = vpi_get_file(fd);
+
+      /* If we do not have a valid file descriptor return EOF, otherwise
+       * check for EOF and return that value. */
+      if (!fp) {
+	    val.value.integer = EOF;
+      } else {
+	    val.value.integer = feof(fp);
+      }
+      vpi_put_value(callh, &val, 0 , vpiNoDelay);
+
+      return 0;
+}
+
+static PLI_INT32 sys_feof_sizetf(PLI_BYTE8 *ud)
+{
+      return 32;
+}
 
 void sys_fileio_register()
 {
@@ -585,5 +662,16 @@ void sys_fileio_register()
       tf_data.user_data = "$ungetc";
       vpi_register_systf(&tf_data);
 
+/* $feof() is from 1364-2005. */
+      //============================== feof
+      tf_data.type      = vpiSysFunc;
+      tf_data.sysfunctype = vpiSysFuncInt;
+      tf_data.tfname    = "$feof";
+      tf_data.calltf    = sys_feof_calltf;
+      tf_data.compiletf = sys_feof_compiletf;
+      tf_data.sizetf    = sys_feof_sizetf;
+      tf_data.user_data = "$feof";
+      vpi_register_systf(&tf_data);
+
 }
 
diff --git a/vpi/sys_scanf.c b/vpi/sys_scanf.c
index e2c499c6d..bf333af59 100644
--- a/vpi/sys_scanf.c
+++ b/vpi/sys_scanf.c
@@ -45,7 +45,7 @@ static int byte_getc(struct byte_source*byte)
       }
 
       ch = fgetc(byte->fd);
-      fprintf(stderr, "byte_getc --> '%c' (%d)\n", ch, ch);
+//      fprintf(stderr, "byte_getc --> '%c' (%d)\n", ch, ch);
       return ch;
 }
 
@@ -599,6 +599,3 @@ void sys_scanf_register()
       vpi_register_systf(&tf_data);
 }
 
-/*
- * $Log $
- */