diff --git a/installer/data/mysql/atomicupdate/bug_15411-change_to_non-fiction.sql b/installer/data/mysql/atomicupdate/bug_15411-change_to_non-fiction.sql
new file mode 100644
index 0000000000..9aff0fa4ad
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_15411-change_to_non-fiction.sql
@@ -0,0 +1 @@
+UPDATE `authorised_values` SET `lib`='Non-fiction' WHERE `lib`='Non Fiction';
diff --git a/installer/data/mysql/en/optional/auth_val.sql b/installer/data/mysql/en/optional/auth_val.sql
index bfc6fec50a..24f036bd20 100644
--- a/installer/data/mysql/en/optional/auth_val.sql
+++ b/installer/data/mysql/en/optional/auth_val.sql
@@ -35,7 +35,7 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC',
 -- collection codes for an item
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','FIC','Fiction');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','REF','Reference');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
+INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non-fiction');
 
 -- withdrawn status of an item, linked to items.withdrawn
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
diff --git a/installer/data/mysql/es-ES/optional/auth_val.sql b/installer/data/mysql/es-ES/optional/auth_val.sql
index 6fe4d43358..e1f9f8cc32 100644
--- a/installer/data/mysql/es-ES/optional/auth_val.sql
+++ b/installer/data/mysql/es-ES/optional/auth_val.sql
@@ -28,7 +28,7 @@ INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('LOC',
 -- collection codes for an item
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','FIC','Fiction');
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','REF','Reference');
-INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non Fiction');
+INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('CCODE','NFIC','Non-fiction');
 
 -- withdrawn status of an item, linked to items.withdrawn
 INSERT INTO `authorised_values` (category, authorised_value, lib) VALUES ('WITHDRAWN','1','Withdrawn');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index b41690de56..6ca70fa593 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -178,7 +178,7 @@
         <select name="limit" class="subtype">
             <option value="" selected="selected" class="menuheader">Any content</option>
             <option value="fic:1" >Fiction</option>
-            <option value="fic:0" >Non fiction</option>
+            <option value="fic:0" >Non-fiction</option>
             <option value="bio:b" >Biography</option>
             <option value="mus:j" >Musical recording</option>
             <option value="mus:i" >Non-musical recording</option>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index d1ce16ae6c..28591bd7d4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -289,7 +289,7 @@
                                             <select id="subtype_content"  name="limit" class="subtype">
                                                 <option value="" selected="selected" class="menuheader">Any content</option>
                                                 <option value="fic:1">Fiction</option>
-                                                <option value="fic:0">Non fiction</option>
+                                                <option value="fic:0">Non-fiction</option>
                                                 <option value="bio:b">Biography</option>
                                                 <option value="mus:j">Musical recording</option>
                                                 <option value="mus:i">Non-musical recording</option>