diff --git a/release_notes_18_05_04.md b/release_notes_18_05_04.md
index 38240f9..93a5e1f 100644
--- a/release_notes_18_05_04.md
+++ b/release_notes_18_05_04.md
@@ -1,5 +1,5 @@
 # RELEASE NOTES FOR KOHA 18.05.04
-24 Sep 2018
+16 Oct 2018
 
 Koha is the first free and open source software library automation
 package (ILS). Development is sponsored by libraries of varying types
@@ -19,48 +19,63 @@ Installation instructions can be found at:
 
 Koha 18.05.04 is a bugfix/maintenance release.
 
-It includes 1 new features, 3 enhancements, 27 bugfixes.
+It includes 4 enhancements, 52 bugfixes.
 
 
 
-## New features
-
-### REST api
-
-- [[21116]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21116) Add API routes through plugins
 
 ## Enhancements
 
 ### Architecture, internals, and plumbing
 
-- [[21202]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21202) C4::Items - Remove GetItemsByBiblioitemnumber
+- [[20287]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20287) Move AddMember and ModMember to Koha::Patron
 
-### REST api
+> Only the Koha::Object->get_from_storage method has been backported for the 18.05.05 release.
 
-- [[21334]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21334) Add bibliographic content type definitions
 
-### Staff Client
+- [[20669]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20669) Add upgrade method to plugins
+- [[21352]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21352) Allow plugins to add CSS and Javascript to Staff interface
 
-- [[13406]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13406) Authority MARC display impossible to style via CSS
+### Notices
+
+- [[15971]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15971) Allow use of all biblio and biblioitems fields (like issn) in serial claim letters
 
 
 ## Critical bugs fixed
 
+### Acquisitions
+
+- [[21385]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21385) Vendor search: Item count is incorrectly updated on partial receive
+
+### Architecture, internals, and plumbing
+
+- [[21133]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21133) Missing use C4::Accounts statement in Koha/Patron.pm
+- [[21432]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21432) Internal Server Error in Checkout History
+
+### Cataloging
+
+- [[21448]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21448) Field 606 doesn't add multiple x subfields
+
 ### Circulation
 
-- [[21231]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21231) BlockReturnofLostItems does not prevent lost items being found
+- [[21176]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21176) decreaseLoanHighHolds does not properly calculate date when  TimeFormat set to 12 hour
 
-### Patrons
+### Installation and upgrade (command-line installer)
 
-- [[21068]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21068) Remove NorwegianPatronDB related code
+- [[16690]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16690) Improve security of remote database installations
+- [[21440]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21440) koha-create expects the file passed by $DEFAULTSQL to be in gzip format
 
-### Templates
+> Add support to koha-create to allow it to accept both compressed and uncompressed files for DEFAULTSQL
 
-- [[13692]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13692) Series link is only using 800a instead of 800t
 
-### Web services
 
-- [[21199]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21199) Patron's attributes are displayed on GetPatronInfo's ILSDI output regardless opac_display
+### Label/patron card printing
+
+- [[21281]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21281) Label Template - Creation not working
+
+### translate.koha-community.org
+
+- [[21480]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21480) misc/translator/translate does not work with perl 5.26
 
 
 ## Other bugs fixed
@@ -71,70 +86,119 @@ It includes 1 new features, 3 enhancements, 27 bugfixes.
 
 ### Acquisitions
 
-- [[21288]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21288) Slowness in acquisition caused by GetInvoices
-- [[21356]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21356) Missing space in parcel.tt
+- [[16739]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16739) Generate EDIFACT on basket groups falsely showing when configuration is incomplete
+- [[19271]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19271) Ordered/Spent lists should display vendor name, not vendor code
+- [[21398]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21398) Search term when adding an order from an existing record should be required
+- [[21417]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21417) EDI ordering fails when basket and EAN libraries do not match
+- [[21425]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21425) basketno not being interpolated into error message
 
 ### Architecture, internals, and plumbing
 
-- [[19991]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19991) use Modern::Perl in OPAC perl scripts
-- [[21207]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21207) C4::Overdues::GetItems is not used
+- [[15734]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15734) Audio Alerts broken
+- [[21396]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21396) Missing use statements in Koha::Account
+- [[21500]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21500) Warnings in rotating collections
 
 ### Authentication
 
-- [[13779]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13779) sessionID declared twice in C4::Auth::checkauth()
+- [[20023]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20023) Password recovery should be case insensitive
+- [[21323]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21323) Redirect page after login missing multiple params
+
+### Cataloging
+
+- [[20785]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20785) Advanced Editor does not honor MarcFieldDocURL
+- [[21362]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21362) Advanced MARC Editor - Rancor - Tab navigation not working in fixed fields
+- [[21407]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21407) Can't enter new macros in the advanced cataloging editor (rancor)
 
 ### Circulation
 
-- [[21168]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21168) Error on circ/returns.pl after deleting checked-in item
+- [[16420]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=16420) Buttons inconsistent between "Hold found" and "Hold found (waiting)" dialogs in checkin
+- [[21463]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21463) Library is no longer displayed in the overdue list
+
+### Command-line Utilities
+
+- [[21322]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21322) process_message_queue.pl --type should take an argument
 
 ### Database
 
-- [[20777]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20777) Remove unused field accountlines.dispute
+- [[5458]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5458) length of items.ccode disagrees with authorised_values.authorised_value
+
+### Fines and fees
+
+- [[21167]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21167) Correct price formatting on printed fee receipt and invoice
+- [[21196]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21196) Allow calcfine to consider default item type replacement cost
+
+### Hold requests
+
+- [[21389]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21389) Javascript error on article requests page bis
+
+### I18N/L10N
+
+- [[19500]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19500) Make module names on letters overview page translatable
+
+### ILL
+
+- [[20548]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20548) Remove copyright clearance workflow from staff created ILL requests
+- [[21289]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21289) Error when sending emails to partner libraries
+
+### Installation and upgrade (command-line installer)
+
+- [[21426]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21426) setting USE_MEMCACHED to "no" in koha-sites.conf does not have any effect
+
+### Lists
+
+- [[21297]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21297) "More lists" screen missing "Select an Existing list" fieldset when all lists are public
+
+### MARC Bibliographic data support
+
+- [[20910]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20910) 773$g not displayed if $0 is present
+
+> Sponsored-by: Escuela de Orientacion Lacaniana
 
-### Label/patron card printing
 
-- [[20765]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20765) Search for items by acqdate does not work in label batch
 
 ### OPAC
 
-- [[20994]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20994) Fix capitalization on OPAC result list "Save to Lists"
-- [[21127]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21127) Remove jqTransform jQuery plugin from the OPAC
+- [[21078]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21078) Overdrive JS breaks when window opened from another site
+- [[21493]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21493) Remove incomplete icon style from serial issues tabs
 
 ### Packaging
 
-- [[21267]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21267) X_FORWARDED_PROTO header should be set in apache
+- [[17237]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=17237) Stop koha-create from creating MySQL users without host restriction
 
 ### Patrons
 
-- [[21096]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21096) Garbled username on intranet login page
+- [[20656]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20656) Print summary for patron shows paid fines and formats payments badly
 
-### Staff Client
+> Print summary for patron will now show only outstanding fines/payments. To print all fines/payments you can use the 'print' option for the table in the accounts page for the patron.
 
-- [[21248]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21248) Fix COinS carp in MARC details page on unknown record
 
-### System Administration
+- [[21353]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21353) Merge patrons option only available with manage_patron_lists
 
-- [[19179]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19179) Email option for SMSSendDriver is not documented as a valid setting
+### Searching
+
+- [[9968]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9968) Incorrect index used for 'Standard number' in advanced search
+- [[20151]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20151) Search is broken when stemming has no language
+- [[21455]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21455) Authority search options get shuffled around when you click on 'Search'
+
+### Searching - Zebra
+
+- [[21416]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21416) 'gr' option missing from ZEBRA_LANGUAGE options in koha-sites.conf
+
+### Serials
+
+- [[20241]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20241) Fix display of publication year in subscription record search for MARC21
 
 ### Templates
 
-- [[21139]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21139) The floating toolbars have some issues
-- [[21285]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21285) Select2 broken on high dpi screens
+- [[13272]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13272) Many inputs lack a type attribute
+- [[20223]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20223) Merge members-menu and circ-menu inc files
+- [[21350]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21350) Add Font Awesome icon for pending onsite checkouts link
+- [[21397]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21397) Routing list tab not marked as active
+- [[21506]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21506) DataTables four button pagination uses the wrong icon for First and Last buttons
 
 ### Test Suite
 
-- [[20776]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20776) Add Selenium::Remote::Driver to dependencies
-- [[21262]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21262) Do not format numbers for editing if too big
-- [[21355]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21355) GetDailyQuotes.t is fragile
-- [[21360]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21360) IssueSlip.t is failing if run at 23:59
-
-### Tools
-
-- [[20564]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20564) Error 500 displays when uploading patron images with a zipped file
-
-### Web services
-
-- [[21235]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21235) Remove services_throttle if not required for ThingISBN
+- [[20177]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20177) Remove GROUP BY clause in GetCourses
 
 
 
@@ -170,9 +234,9 @@ interface are available in this release for the following languages:
 - Arabic (100%)
 - Armenian (100%)
 - Basque (73.4%)
-- Chinese (China) (77.9%)
+- Chinese (China) (78%)
 - Chinese (Taiwan) (100%)
-- Czech (93.3%)
+- Czech (93.5%)
 - Danish (64.3%)
 - English (New Zealand) (96.8%)
 - English (USA)
@@ -183,16 +247,16 @@ interface are available in this release for the following languages:
 - German (Switzerland) (99.7%)
 - Greek (80.8%)
 - Hindi (100%)
-- Italian (98.1%)
-- Norwegian Bokmål (66.4%)
+- Italian (98.6%)
+- Norwegian Bokmål (68.6%)
 - Occitan (post 1500) (71.1%)
 - Persian (53.4%)
 - Polish (94.8%)
 - Portuguese (100%)
-- Portuguese (Brazil) (83.8%)
+- Portuguese (Brazil) (84.1%)
 - Slovak (95.6%)
 - Spanish (100%)
-- Swedish (94.9%)
+- Swedish (95%)
 - Turkish (100%)
 - Vietnamese (65.8%)
 
@@ -257,74 +321,86 @@ The release team for Koha 18.05.04 is
 We thank the following libraries who are known to have sponsored
 new features in Koha 18.05.04:
 
+- Escuela de Orientacion Lacaniana
 
 We thank the following individuals who contributed patches to Koha 18.05.04.
 
-- Nick Clemens (7)
-- Tomás Cohen Arazi (10)
-- David Cook (1)
-- Charlotte Cordwell (2)
-- Caroline Cyr La Rose (1)
+- Alberto (1)
+- Blou (1)
+- Christopher Brannon (1)
+- Colin Campbell (2)
+- Nick Clemens (8)
+- Tomás Cohen Arazi (2)
 - Marcel de Rooy (2)
-- Jonathan Druart (9)
-- Katrin Fischer (1)
-- Pasi Kallinen (2)
-- Owen Leonard (2)
-- Kyle M Hall (2)
-- Martin Renvoize (9)
-- Jane Sandberg (2)
-- Fridolin Somers (1)
-- Koha translators (2)
+- Jonathan Druart (20)
+- Magnus Enger (1)
+- Katrin Fischer (5)
+- Andrew Isherwood (3)
+- Pasi Kallinen (1)
+- Olli-Antti Kivilahti (1)
+- Jon Knight (1)
+- Owen Leonard (4)
+- Ere Maijala (1)
+- Kyle M Hall (4)
+- Josef Moravec (2)
+- Martin Renvoize (8)
+- Andreas Roussos (4)
+- Fridolin Somers (3)
+- Mark Tompsett (6)
 
 We thank the following libraries, companies, and other institutions who contributed
 patches to Koha 18.05.04
 
-- ACPL (2)
-- BibLibre (2)
-- BSZ BW (1)
-- bugs.koha-community.org (9)
-- ByWater-Solutions (7)
+- ACPL (4)
+- BibLibre (3)
+- BSZ BW (5)
+- bugs.koha-community.org (20)
+- ByWater-Solutions (9)
 - bywatersolutiosn.com (2)
-- joensuu.fi (2)
-- linnbenton.edu (2)
-- Prosentient Systems (1)
-- PTFS-Europe (9)
+- bywatetsolutions.com (1)
+- cdalibrary.org (1)
+- helsinki.fi (2)
+- icloud.com (1)
+- joensuu.fi (1)
+- Libriotech (1)
+- Loughborough University (1)
+- PTFS-Europe (13)
 - Rijksmuseum (2)
 - Solutions inLibro inc (1)
-- Theke Solutions (10)
-- unidentified (2)
+- Theke Solutions (2)
+- unidentified (12)
 
 We also especially thank the following individuals who tested patches
 for Koha.
 
-- Alex Arnaud (2)
-- 's avatarMarcel de Rooy (1)
-- Christopher Brannon (1)
-- Nick Clemens (43)
-- Tomas Cohen Arazi (12)
-- Chris Cormack (2)
-- Michal Denar (1)
-- Michal Denar (2)
-- Marcel de Rooy (8)
-- Jonathan Druart (12)
-- Katrin Fischer (6)
+- Claudio (1)
+- José Anjos (1)
+- Colin Campbell (1)
+- Barry Cannon (2)
+- Nick Clemens (74)
+- Tomas Cohen Arazi (6)
+- Chris Cormack (11)
+- Caroline Cyr La rose (2)
+- Caroline Cyr La Rose (4)
+- Michal Denar (10)
+- Marcel de Rooy (6)
+- Jonathan Druart (16)
+- Katrin Fischer (18)
 - Brendan Gallagher (1)
+- Claire Gravely (1)
+- Dilan Johnpullé (1)
 - Pasi Kallinen (1)
-- Ulrich Kleiber (1)
-- Owen Leonard (2)
+- Owen Leonard (8)
 - Jesse Maseto (1)
+- Julian Maurice (5)
 - Kyle M Hall (1)
-- Josef Moravec (4)
-- Josef Moravec's avatarJosef Moravec (1)
-- Wm. Nick Clemens's avatarNick Clemens (1)
-- Martin Renvoize (55)
-- Benjamin Rokseth (1)
-- Jane Sandberg (2)
-- Maryse Simard (2)
-- Fridolin Somers (1)
-- John Sterbenz (1)
-- Mark Tompsett (8)
-- George Williams (1)
+- Josef Moravec (10)
+- David Nind (1)
+- Séverine QUEUNE (6)
+- Martin Renvoize (100)
+- Andreas Roussos (1)
+- Pierre-Marc Thibault (4)
+- Mark Tompsett (1)
 
 
 We regret any omissions.  If a contributor has been inadvertently missed,
@@ -351,4 +427,4 @@ tracker at:
 He rau ringa e oti ai.
 (Many hands finish the work)
 
-Autogenerated release notes updated last on 24 Sep 2018 13:10:19.
+Autogenerated release notes updated last on 16 Oct 2018 10:58:40.