diff --git a/share/sgml/events.xml b/share/sgml/events.xml
index 7c2d12955f..f0029e6afc 100644
--- a/share/sgml/events.xml
+++ b/share/sgml/events.xml
@@ -10,7 +10,7 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/events.xml,v 1.52 2008/05/30 14:22:47 brueffer Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.53 2008/06/29 17:55:09 murray Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -114,6 +114,7 @@
       have a FreeBSD booth this year.  Matt Olander, Dru Lavigne, and
       others will help spread the word about FreeBSD.
     </description>
+    <upcomingurl>http://upcoming.yahoo.com/event/430248/</upcomingurl>
   </event>
 
   <event id="lsm-2008">
@@ -137,6 +138,7 @@
     <description>The Libre Software Meeting has occurred each year
       since July 2000.  This year there will again be a FreeBSD boot
       camp to introduce new users to the Operating System.</description>
+    <upcomingurl>http://upcoming.yahoo.com/event/685886/</upcomingurl>
   </event>
 
   <event id="linuxtag-2008">
diff --git a/share/sgml/templates.events.xsl b/share/sgml/templates.events.xsl
index a8470f78af..d32d739b14 100644
--- a/share/sgml/templates.events.xsl
+++ b/share/sgml/templates.events.xsl
@@ -9,7 +9,7 @@
 <!ENTITY % header.rss "INCLUDE">
 ]>
 
-<!-- $FreeBSD: www/share/sgml/templates.events.xsl,v 1.9 2008/06/23 05:56:49 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/templates.events.xsl,v 1.10 2008/06/23 07:08:02 murray Exp $ -->
 
 <!-- Copyright (c) 2003 Simon L. Nielsen <simon@FreeBSD.org>
      Copyright (c) 2008 Murray M Stokely <murray@FreeBSD.org>
@@ -289,8 +289,13 @@
     <li>
       <xsl:call-template name="eventbody"/>
       <p>Social links: <a rel="nofollow">
-        <xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>
-upcoming</a></p>
+      <xsl:if test="upcomingurl">
+        <xsl:attribute name="href"><xsl:value-of select="upcomingurl" /></xsl:attribute>
+      </xsl:if>
+      <xsl:if test="not(upcomingurl)">
+        <xsl:attribute name="href">http://upcoming.yahoo.com/search?type=Events&amp;q=<xsl:value-of select="name" />&amp;Search=GO</xsl:attribute>        
+      </xsl:if>
+      upcoming</a></p>
     </li>
   </xsl:template>