diff --git a/elaborate.cc b/elaborate.cc
index e117b6bfb..3324a371d 100644
--- a/elaborate.cc
+++ b/elaborate.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: elaborate.cc,v 1.368 2007/04/13 02:34:35 steve Exp $"
+#ident "$Id: elaborate.cc,v 1.369 2007/04/15 20:45:40 steve Exp $"
 #endif
 
 # include "config.h"
@@ -1947,6 +1947,7 @@ NetProc* PCallTask::elaborate_usr(Design*des, NetScope*scope) const
 	   to make a sequential block to hold the generated code. */
       if (nparms() == 0) {
 	    cur = new NetUTask(task);
+	    cur->set_line(*this);
 	    return cur;
       }
 
@@ -1987,6 +1988,7 @@ NetProc* PCallTask::elaborate_usr(Design*des, NetScope*scope) const
 
 	/* Generate the task call proper... */
       cur = new NetUTask(task);
+      cur->set_line(*this);
       block->append(cur);
 
 
@@ -3413,6 +3415,9 @@ Design* elaborate(list<perm_string>roots)
 
 /*
  * $Log: elaborate.cc,v $
+ * Revision 1.369  2007/04/15 20:45:40  steve
+ *  Attach line number information to task calls.
+ *
  * Revision 1.368  2007/04/13 02:34:35  steve
  *  Parse edge sensitive paths without edge specifier.
  *
diff --git a/vpi/sys_display.c b/vpi/sys_display.c
index 8205c3621..308e39ea7 100644
--- a/vpi/sys_display.c
+++ b/vpi/sys_display.c
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: sys_display.c,v 1.76 2007/04/12 02:50:51 steve Exp $"
+#ident "$Id: sys_display.c,v 1.77 2007/04/15 20:45:40 steve Exp $"
 #endif
 
 # include "vpi_config.h"
@@ -1602,6 +1602,30 @@ void sys_display_register()
       tf_data.compiletf = 0;
       tf_data.sizetf    = 0;
       tf_data.user_data = "$fwrite";
+      vpi_register_systf(&tf_data);
+
+      tf_data.type      = vpiSysTask;
+      tf_data.tfname    = "$fwriteh";
+      tf_data.calltf    = sys_fdisplay_calltf;
+      tf_data.compiletf = 0;
+      tf_data.sizetf    = 0;
+      tf_data.user_data = "$fwriteh";
+      vpi_register_systf(&tf_data);
+
+      tf_data.type      = vpiSysTask;
+      tf_data.tfname    = "$fwriteo";
+      tf_data.calltf    = sys_fdisplay_calltf;
+      tf_data.compiletf = 0;
+      tf_data.sizetf    = 0;
+      tf_data.user_data = "$fwriteo";
+      vpi_register_systf(&tf_data);
+
+      tf_data.type      = vpiSysTask;
+      tf_data.tfname    = "$fwriteb";
+      tf_data.calltf    = sys_fdisplay_calltf;
+      tf_data.compiletf = 0;
+      tf_data.sizetf    = 0;
+      tf_data.user_data = "$fwriteb";
       vpi_register_systf(&tf_data);
 
 	//============================ timeformat
@@ -1628,6 +1652,9 @@ void sys_display_register()
 
 /*
  * $Log: sys_display.c,v $
+ * Revision 1.77  2007/04/15 20:45:40  steve
+ *  Attach line number information to task calls.
+ *
  * Revision 1.76  2007/04/12 02:50:51  steve
  *  Add printtimescale (caryr)
  *