--- location.tpl.php	2008-08-21 12:48:56.000000000 -0400
+++ location.tpl.php	2009-06-02 14:53:15.281250000 -0400
@@ -1,10 +1,11 @@
 <div class="location vcard"><div class="adr">
 <?php echo $name; ?>
+
 <?php if ($street) {?>
 <div class="street-address"><?php
   echo $street;
   if ($additional) {
-    echo ' '. $additional;
+    echo ' <span class="street2">'. $additional .'</span>';
   }
 ?></div>
 <?php }?>
@@ -25,9 +26,18 @@
     echo implode(', ', $city_province_postal);
   }
 ?>
+
 <?php if ($country_name) { ?>
 <div class="country-name"><?php echo $country_name; ?></div>
 <?php } ?>
+
+<?php if ($phone): ?>
+<div class="phone"><strong class="phone-label"><?php print t("Phone")?>: </strong><?php print $phone; ?></div>
+<?php endif; ?>
+<?php if ($fax): ?>
+<div class="fax"><strong class="fax-label"><?php print t("Fax");?>: </strong><?php print $fax; ?></div>
+<?php endif; ?>
+
 <?php
   // "Geo" microformat, see http://microformats.org/wiki/geo
   if ($latitude && $longitude) {