diff --git a/pages/index/0.php b/pages/index/0.php
index 3c1d4ac..0c5fe4a 100644
--- a/pages/index/0.php
+++ b/pages/index/0.php
@@ -23,6 +23,7 @@
 <li><?=_("Inclusion into mainstream browsers!")?></li>
 <li><?=_("To provide a trust mechanism to go with the security aspects of encryption.")?></li>
 </ul>
+<p><?=sprintf(_("For general documentation and help please see our %s site, powered by %s"), "<a href='http://wiki.CAcert.org'>"._("Wiki Documentation")."</a>", "<a href='http://moinmoin.wikiwikiweb.de' target='_new'>MoinMoin</a>")?>.</p>
 <?
 /*
 	$query = "select *, UNIX_TIMESTAMP(`when`) as `TS` from news order by `when` desc limit 5";
@@ -41,7 +42,7 @@
 	$fp = @fopen("http://blog.CAcert.org/feed/rss/", "r");
 	if($fp)
 	{
-		echo '<br><p><a href="http://blog.CAcert.org">'._('Latest News').'</a> - [ <a href="http://blog.CAcert.org">'._('More News Items').'</a> ]</p>';
+		echo '<p><a href="http://blog.CAcert.org">'._('Latest News').'</a> - [ <a href="http://blog.CAcert.org">'._('More News Items').'</a> ]</p>';
 
 
 		while(!feof($fp))
diff --git a/stamp/index.php b/stamp/index.php
index 845e472..eddb6d7 100644
--- a/stamp/index.php
+++ b/stamp/index.php
@@ -31,14 +31,19 @@ google_ad_channel = "";
 		following line somewhere on your website:</p>
       <p>&lt;script type="text/javascript"&gt;<br />
 	&lt;!--<br />
-		document.write('&lt;script type="text/javascript" src="'+(location.protocol=='https'?'https':'http')+'://stamp.cacert.org/showlogo.php"&gt;&lt;/script&gt;');<br />
+		document.write('&lt;');<br />
+		document.write('script type="text/javascript" src="'+location.protocol+'//stamp.cacert.org/showlogo.php"&gt;&lt;');<br />
+		document.write('/script&gt;');<br />
 	//--&gt;<br />
 	&lt;/script&gt;</p>
 	<script type="text/javascript">
 	<!--
-		document.write('<script type="text/javascript" src="'+(location.protocol=='https'?'https':'http')+'://stamp.cacert.org/showlogo.php"></script>');
+		document.write('<');
+		document.write('script type="text/javascript" src="'+location.protocol+'//stamp.cacert.org/showlogo.php"><');
+		document.write('/script>');
 	//-->
 	</script>
+	<br /><br /><br /><br />
     </div>
   </div>
  </div>
diff --git a/stamp/showlogo.php b/stamp/showlogo.php
index 3b67ce7..7f9045c 100644
--- a/stamp/showlogo.php
+++ b/stamp/showlogo.php
@@ -1,13 +1,25 @@
-<?
-	if($_SERVER['HTTPS']=="on")
-		$URI = "https://";
-	else
-		$URI = "http://";
-?>
-var curDateTime = new Date();
-var tz = -(curDateTime.getTimezoneOffset()/60);
-document.write("<script type='text/javascript'>function popup() { ");
-document.write("window.open('<?=$URI?>stamp.cacert.org/certdet.php?refer="+location.href+"&tz="+tz+"', 'CertInfo',");
-document.write("'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=600,height=400,left=200,top=100'); } </script>");
-document.write("<a href='#' onClick='popup(); return false;'>");
-document.write("<img src='<?=$URI?>stamp.cacert.org/displogo.php?refer="+location.href+"&tz="+tz+"' border='0' /></a>");
+try
+{
+	var URI = location.protocol+'//stamp.cacert.org';
+	var URL = encodeURIComponent(URI);
+	var curDateTime = new Date();
+	var tz = -(curDateTime.getTimezoneOffset()/60);
+	var rf = encodeURIComponent(parent==self ? window.document.referrer : top.document.referrer);
+	var ul = encodeURIComponent(navigator.appName=="Netscape" ? navigator.language : navigator.userLanguage);
+	if(typeof(screen)=="object")
+	{
+		var sr = encodeURIComponent(screen.width+","+screen.height);
+		var cd = encodeURIComponent(screen.colorDepth);
+		var jo = encodeURIComponent(navigator.javaEnabled()?"Yes":"No");
+	}
+
+	document.write("<script type='text/javascript'>function popup() { ");
+	document.write("window.open('"+URI+"/certdet.php?refer="+location.href+"&tz="+tz+"', 'CertInfo',");
+	document.write("'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=600,height=400,left=200,top=100'); } </script>");
+	document.write("<a href='#' onClick='popup(); return false;'>");
+	document.write("<img src='"+URI+"/displogo.php?refer="+location.href+"&tz="+tz+"&rf="+rf+"&ul="+ul+"&sr="+sr+"&cd="+cd+"&jo="+jo+"&URL="+URL+"' border='0' /></a>");
+}
+catch(e)
+{
+	document.write("<img src='http://stamp.cacert.org/javascript_is_broken.php'/>");
+}