diff --git a/buglink.tgz b/buglink.tgz
new file mode 100644
index 000000000..9d27ee62b
Binary files /dev/null and b/buglink.tgz differ
diff --git a/buglink/bug-x.gif b/buglink/bug-x.gif
new file mode 100644
index 000000000..10936caa7
Binary files /dev/null and b/buglink/bug-x.gif differ
diff --git a/buglink/buglink.php b/buglink/buglink.php
new file mode 100644
index 000000000..8091f2f6d
--- /dev/null
+++ b/buglink/buglink.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Name: BugLink
+ * Description: Show link to Friendica bug site at bottom of page
+ * Version: 1.0
+ * Author: Mike Macgirvin <mike@macgirvin.com>
+ */
+
+
+function buglink_install() {
+	register_hook('page_end', 'addon/buglink/buglink.php', 'buglink_active');
+}
+
+function piwik_uninstall() {
+	unregister_hook('page_end', 'addon/buglink/buglink.php', 'buglink_active');
+}
+
+
+function buglink_active(&$a,&$b) {
+	$b .= '<div style="position: fixed; bottom: 5px; left: 5px;"><a href="http://bugs.friendica.com" title="' . t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . t('Report Bug') . '" /></a></div>';
+} 
\ No newline at end of file