--- node.tpl.php	2006-08-29 12:43:34.000000000 -0500
+++ node.tpl.org.php	2006-08-29 12:40:47.000000000 -0500
@@ -7,7 +7,7 @@
     <h3><a href="<?php print $node_url?>" rel="bookmark" title='Permanent Link to "<?php print $title?>"'><?php print $title?></a></h3> 
     <?php }; ?>
     <?php if ( node_access('update', $node) ) { ?>
-    <span class="editlink"><a href="<?php print url("node/$node->nid/edit") ?>"><img src="<?php print base_path() . $directory ?>/images/pencil.png" alt="Edit Link" /></a></span>
+    <span class="editlink"><a href="<?php print $node_url ?>/edit"><img src="<?php print base_path() . $directory ?>/images/pencil.png" alt="Edit Link" /></a></span>
     <?php }; ?>
     <small class="metadata"> <span class="chronodata">Published <?php print $date ?> <span class="commentslink"><?php print $links?></span></span> 
     <?php if ($terms) { ?> 
@@ -15,4 +15,4 @@
     <?php } ?> 
     </small> </div> 
   <div class="itemtext"> <?php print $content?> </div> 
-</div>
+</div>
\ No newline at end of file