diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index ed673da455..d004fe1d64 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -3056,6 +3056,26 @@ CREATE TABLE IF NOT EXISTS `borrower_modifications` (
   KEY `borrowernumber` (`borrowernumber`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+--
+-- Table structure for table linktracker
+-- This stores clicks to external links
+--
+
+DROP TABLE IF EXISTS linktracker;
+CREATE TABLE linktracker (
+   id int(11) NOT NULL AUTO_INCREMENT, -- primary key identifier
+   biblionumber int(11) DEFAULT NULL, -- biblionumber of the record the link is from
+   itemnumber int(11) DEFAULT NULL, -- itemnumber if applicable that the link was from
+   borrowernumber int(11) DEFAULT NULL, -- borrowernumber who clicked the link
+   url text, -- the link itself
+   timeclicked datetime DEFAULT NULL, -- the date and time the link was clicked
+   PRIMARY KEY (id),
+   KEY bibidx (biblionumber),
+   KEY itemidx (itemnumber),
+   KEY borridx (borrowernumber),
+   KEY dateidx (timeclicked)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index 40bbfed3d8..cad409c53d 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -417,3 +417,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES (
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UNIMARCField100Language', 'fre','UNIMARC field 100 default language',NULL,'short');
 INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('Persona',0,'Use Mozilla Persona for login','','YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacItemLocation','callnum','Show the shelving location of items in the opac','callnum|ccode|location','Choice');
+INSERT INTO systempreferences (variable,value,explanation,options,type)  VALUES('TrackClicks','0','Track links clicked',NULL,'Integer');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 4fa2fccf4c..eb8ce80073 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -6444,6 +6444,27 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.11.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do("CREATE TABLE linktracker (
+	  id int(11) NOT NULL AUTO_INCREMENT,
+	  biblionumber int(11) DEFAULT NULL,
+	  itemnumber int(11) DEFAULT NULL,
+	  borrowernumber int(11) DEFAULT NULL,
+	  url text,
+	  timeclicked datetime DEFAULT NULL,
+	  PRIMARY KEY (id),
+	  KEY bibidx (biblionumber),
+	  KEY itemidx (itemnumber),
+	  KEY borridx (borrowernumber),
+	  KEY dateidx (timeclicked)
+	) ENGINE=InnoDB DEFAULT CHARSET=utf8;");
+    $dbh->do("
+  INSERT INTO systempreferences (variable,value,explanation,options,type)
+  VALUES('TrackClicks','0','Track links clicked',NULL,'Integer')");
+    print "Upgrade to $DBversion done (Adds feature Bug 8917, the ability to track links clicked)";
+    SetVersion ($DBversion);
+}
 
 $DBversion = "3.11.00.024";
 if ( CheckVersion($DBversion) ) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index f1be4494ab..57df5127a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -525,6 +525,14 @@ OPAC:
             - pref: AnonymousPatron
               class: integer
             - as the Anonymous Patron (for anonymous suggestions and reading history)
+        -
+            - pref: TrackClicks
+              default: 0
+              choices:
+                  anonymous: "Track anonymously"
+                  track: "Track"
+                  no: "Don't track"
+            - links that patrons click on
 
     Shelf Browser:
         -