diff --git a/CRM/Upgrade/Incremental/sql/5.17.4.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.17.4.mysql.tpl
new file mode 100644
index 000000000000..bf00882ddf36
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.17.4.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.17.4 during upgrade *}
diff --git a/release-notes.md b/release-notes.md
index 51936b413205..8a49819b296c 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -15,6 +15,15 @@ Other resources for identifying changes are:
     * https://github.com/civicrm/civicrm-joomla
     * https://github.com/civicrm/civicrm-wordpress
 
+## CiviCRM 5.17.4
+
+Released September 12, 2019
+
+- **[Synopsis](release-notes/5.17.4.md#synopsis)**
+- **[Bugs resolved](release-notes/5.17.4.md#bugs)**
+- **[Credits](release-notes/5.17.4.md#credits)**
+- **[Feedback](release-notes/5.17.4.md#feedback)**
+
 ## CiviCRM 5.17.3
 
 Released September 10, 2019
diff --git a/release-notes/5.17.4.md b/release-notes/5.17.4.md
new file mode 100644
index 000000000000..40fe84125dc9
--- /dev/null
+++ b/release-notes/5.17.4.md
@@ -0,0 +1,42 @@
+# CiviCRM 5.17.4
+
+Released September 12, 2019
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?*                                         |         |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities?                                   |   no    |
+| Change the database schema?                                     |   no    |
+| Alter the API?                                                  |   no    |
+| Require attention to configuration options?                     |   no    |
+| Fix problems installing or upgrading to a previous version?     |   no    |
+| Introduce features?                                             |   no    |
+| **Fix bugs?**                                                   | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+- **_CiviEvent_: Incorrect validation message when using a template and custom field ([dev/core#1241](https://lab.civicrm.org/dev/core/issues/1241): [#15292](https://github.com/civicrm/civicrm-core/pull/15292))**
+- **_Export_: Export hook omits most parameters ([dev/core#1247](https://lab.civicrm.org/dev/core/issues/1247): [#15287](https://github.com/civicrm/civicrm-core/pull/15287))**
+- **_Search Builder_: Fatal error if `Household` type is disabled ([dev/core#1246](https://lab.civicrm.org/dev/core/issues/1246): [#15284](https://github.com/civicrm/civicrm-core/pull/15284))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Megaphone Technology Consulting -
+Jon Goldberg; Marcus J Wilson; JMA Consulting - Monish Deb; Dave D; Coop
+SymbioTIC - Mathieu Lutfy; CiviCoop - Jaap Jansma; CiviCRM - Coleman Watts,
+Tim Otten; Caltha - Tomasz Pietrzkowski; Australian Greens - Seamus Lee;
+Agileware - Justin Freeman
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt.  If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 874b8547c86b..8c09872fbcd6 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.17.3',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.17.4',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/xml/version.xml b/xml/version.xml
index 4735d1b1f18e..21d597b7d4b1 100644
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.17.3</version_no>
+  <version_no>5.17.4</version_no>
 </version>