Index: portal-impl/impl/src/java/org/sakaiproject/portal/charon/CharonPortal.java
===================================================================
--- portal-impl/impl/src/java/org/sakaiproject/portal/charon/CharonPortal.java	(revision 15369)
+++ portal-impl/impl/src/java/org/sakaiproject/portal/charon/CharonPortal.java	(working copy)
@@ -1473,15 +1473,24 @@
 		String logo = skinRepo + "/" + skin + "/images/logo_inst.gif";
 		String banner = skinRepo + "/" + skin + "/images/banner_inst.gif";
 
+		String logoAnchorStart = "";
+		String logoAnchorEnd = "";
+		String logoLink = ServerConfigurationService.getString("logo.link");
+		
+		if (logoLink != null && logoLink.trim().length() > 0) {
+			logoAnchorStart = "		<a href=\"" + logoLink + "\">";
+			logoAnchorEnd = "</a>";
+		}
+		
 		String siteType = calcSiteType(siteId);
 		String cssClass = (siteType != null) ?  siteType : "undeterminedSiteType";
 		out.println("<div id=\"siteNavWrapper\" class=\"" + cssClass + "\">");
 		out.println("<div id=\"mastHead\">");
 		out.println("	<div id=\"mastLogo\">");
-		out.println("		<img title=\"Logo\" alt=\"Logo\" src=\"" + logo + "\" />");
+		out.println(logoAnchorStart + "<img title=\"Logo\" alt=\"Logo\" src=\"" + logo + "\" border=\"0\"/>" + logoAnchorEnd);
 		out.println("	</div>");
 		out.println("	<div id=\"mastBanner\">");
-		out.println("		<img title=\"Banner\" alt=\"Banner\" src=\"" + banner + "\" />");
+		out.println("		<img title=\"Banner\" alt=\"Banner\" src=\"" + banner + "\" border=\"0\"/>");
 		out.println("	</div>");
 		out.println("	<div id=\"mastLogin\">");
 		includeLogin(out, req, session);