diff --git a/C4/Auth.pm b/C4/Auth.pm
index 449cfecd7b..259b6d6063 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -581,7 +581,6 @@ sub get_template_and_user {
hidelostitems => C4::Context->preference("hidelostitems"),
mylibraryfirst => ( C4::Context->preference("SearchMyLibraryFirst") && C4::Context->userenv ) ? C4::Context->userenv->{'branch'} : '',
opacbookbag => "" . C4::Context->preference("opacbookbag"),
- opaccredits => "" . C4::Context->preference("opaccredits"),
OpacFavicon => C4::Context->preference("OpacFavicon"),
opaclanguagesdisplay => "" . C4::Context->preference("opaclanguagesdisplay"),
opacreadinghistory => C4::Context->preference("opacreadinghistory"),
@@ -1256,7 +1255,6 @@ sub checkauth {
opacuserlogin => C4::Context->preference("opacuserlogin"),
OpacNav => C4::Context->preference("OpacNav"),
OpacNavBottom => C4::Context->preference("OpacNavBottom"),
- opaccredits => C4::Context->preference("opaccredits"),
OpacFavicon => C4::Context->preference("OpacFavicon"),
opacreadinghistory => C4::Context->preference("opacreadinghistory"),
opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
diff --git a/installer/data/mysql/atomicupdate/bug_23795-move-opaccredits-to-news.perl b/installer/data/mysql/atomicupdate/bug_23795-move-opaccredits-to-news.perl
new file mode 100644
index 0000000000..225820b0ac
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_23795-move-opaccredits-to-news.perl
@@ -0,0 +1,30 @@
+$DBversion = 'XXX'; # will be replaced by the RM
+if( CheckVersion( $DBversion ) ) {
+
+ # get list of installed translations
+ require C4::Languages;
+ my @langs;
+ my $tlangs = C4::Languages::getTranslatedLanguages();
+
+ foreach my $language ( @$tlangs ) {
+ foreach my $sublanguage ( @{$language->{'sublanguages_loop'}} ) {
+ push @langs, $sublanguage->{'rfc4646_subtag'};
+ }
+ }
+
+ # Get any existing value from the opaccredits system preference
+ my ($opaccredits) = $dbh->selectrow_array( q|
+ SELECT value FROM systempreferences WHERE variable='opaccredits';
+ |);
+ if( $opaccredits ){
+ foreach my $lang ( @langs ) {
+ print "Inserting opaccredits contents into $lang news item...\n";
+ # If there is a value in the opaccredits preference, insert it into opac_news
+ $dbh->do("INSERT INTO opac_news (branchcode, lang, title, content ) VALUES (NULL, ?, '', ?)", undef, "opaccredits_$lang", $opaccredits);
+ }
+ }
+ # Remove the opaccredits system preference
+ $dbh->do("DELETE FROM systempreferences WHERE variable='opaccredits'");
+ SetVersion ($DBversion);
+ print "Upgrade to $DBversion done (Bug 23795: Convert OpacCredits system preference to news block)\n";
+}
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index ded953724a..9f1543940c 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -379,7 +379,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('OpacCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the OPAC', 'YesNo'),
('OPACCustomCoverImages','0',NULL,'If enabled, the custom cover images will be displayed at the OPAC. CustomCoverImagesURL must be defined.','YesNo'),
('OpacCustomSearch','','70|10','Replace the search box on the OPAC with the provided HTML','Textarea'),
-('opaccredits','','70|10','Define HTML Credits at the bottom of the OPAC page','Textarea'),
('OPACdefaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
('OPACdefaultSortOrder','dsc','asc|dsc|za|az','Specify the default sort order','Choice'),
('OPACdidyoumean','',NULL,'Did you mean? configuration for the OPAC. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free'),
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 4b9ab453a5..9396fcbb75 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
@@ -251,12 +251,6 @@ OPAC:
type: textarea
syntax: text/html
class: code
- -
- - "Include the following HTML in the footer of all pages in the OPAC:"
- - pref: opaccredits
- type: textarea
- syntax: text/html
- class: code
-
- 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
- ' Note: The placeholders {BIBLIONUMBER}, {CONTROLNUMBER}, {TITLE}, {ISBN}, {ISSN} and {AUTHOR} will be replaced with information from the displayed record.'
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
index 8059f2c03b..12e835ddeb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
@@ -332,7 +332,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]
[% END %]
[% FOREACH lang_lis IN lang_list %]