diff --git a/Koha/Template/Plugin/HtmlTags.pm b/Koha/Template/Plugin/HtmlTags.pm
new file mode 100644
index 0000000000..301e21f81d
--- /dev/null
+++ b/Koha/Template/Plugin/HtmlTags.pm
@@ -0,0 +1,40 @@
+package Koha::Template::Plugin::HtmlTags;
+
+# Copyright Marc Véron / marc veron ag, Switzerland
+
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
+
+use Modern::Perl;
+
+use Template::Plugin::Filter;
+use base qw( Template::Plugin::Filter );
+
+our $DYNAMIC = 1;
+
+sub filter {
+    my ( $self, $text, $args, $config ) = @_;
+    return "" unless $text;
+    return $text unless $config->{tag};
+    $config->{attributes} //= '';
+
+    if ( $config->{attributes} ) {
+        return '<' . $config->{tag} . ' ' . $config->{attributes} . '>' . $text . '</' . $config->{tag} . '>';
+    } else {
+        return '<' . $config->{tag} . '>' . $text . '</' . $config->{tag} . '>';
+    }
+}
+
+1;