diff --git a/plugins/archiveorg/archiveorg.html b/plugins/archiveorg/archiveorg.html
new file mode 100644
index 0000000..ce3bc6b
--- /dev/null
+++ b/plugins/archiveorg/archiveorg.html
@@ -0,0 +1 @@
+<span><a href="https://web.archive.org/web/%s"><img width="13" height="13" src="plugins/archiveorg/internetarchive.png" title="View on archive.org" /></a></span>
\ No newline at end of file
diff --git a/plugins/archiveorg/archiveorg.php b/plugins/archiveorg/archiveorg.php
new file mode 100644
index 0000000..7d17258
--- /dev/null
+++ b/plugins/archiveorg/archiveorg.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Plugin Archive.org.
+ *
+ * Add an icon in the link list for archive.org.
+ */
+
+/**
+ * Add archive.org icon to link_plugin when rendering linklist.
+ *
+ * @param mixed $data - linklist data.
+ *
+ * @return mixed - linklist data with archive.org plugin.
+ */
+function hook_archiveorg_render_linklist($data)
+{
+    $archive_html = file_get_contents(PluginManager::$PLUGINS_PATH . '/archiveorg/archiveorg.html');
+
+    foreach ($data['links'] as &$value) {
+        $archive = sprintf($archive_html, $value['url']);
+        $value['link_plugin'][] = $archive;
+    }
+
+    return $data;
+}
diff --git a/plugins/archiveorg/internetarchive.png b/plugins/archiveorg/internetarchive.png
new file mode 100644
index 0000000..ca07076
Binary files /dev/null and b/plugins/archiveorg/internetarchive.png differ
diff --git a/tests/plugins/PluginArchiveorgTest.php b/tests/plugins/PluginArchiveorgTest.php
new file mode 100644
index 0000000..dbc52bc
--- /dev/null
+++ b/tests/plugins/PluginArchiveorgTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * PluginArchiveorgTest.php
+ */
+
+require_once 'plugins/archiveorg/archiveorg.php';
+
+/**
+ * Class PlugQrcodeTest
+ * Unit test for the QR-Code plugin
+ */
+class PluginArchiveorgTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Reset plugin path
+     */
+    function setUp()
+    {
+        PluginManager::$PLUGINS_PATH = 'plugins';
+    }
+
+    /**
+     * Test render_linklist hook.
+     */
+    function testArchiveorgLinklist()
+    {
+        $str = 'http://randomstr.com/test';
+        $data = array(
+            'title' => $str,
+            'links' => array(
+                array(
+                    'url' => $str,
+                )
+            )
+        );
+
+        $data = hook_archiveorg_render_linklist($data);
+        $link = $data['links'][0];
+        // data shouldn't be altered
+        $this->assertEquals($str, $data['title']);
+        $this->assertEquals($str, $link['url']);
+
+        // plugin data
+        $this->assertEquals(1, count($link['link_plugin']));
+        $this->assertNotFalse(strpos($link['link_plugin'][0], $str));
+    }
+}