diff --git a/0001-Add-workaround-for-systemd-s-lack-of-true-launch-on-.patch b/0001-Add-workaround-for-systemd-s-lack-of-true-launch-on-.patch
new file mode 100644
index 0000000..b496b55
--- /dev/null
+++ b/0001-Add-workaround-for-systemd-s-lack-of-true-launch-on-.patch
@@ -0,0 +1,40 @@
+From f8688d733bc1ecf86e5b7af7c40b758c0c9c4f28 Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Thu, 5 Sep 2019 12:43:58 -0400
+Subject: [PATCH] Add workaround for systemd's lack of true launch-on-demand
+ support (Issue #5640)
+
+---
+ CHANGES.md       | 1 +
+ scheduler/main.c | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/CHANGES.md b/CHANGES.md
+index 3d7271f67..b9c8d81a2 100644
+--- a/CHANGES.md
++++ b/CHANGES.md
+@@ -5,6 +5,7 @@ CHANGES - 2.3.1 - 2019-09-05
+ Changes in CUPS v2.3.1
+ ----------------------
+ 
++- Added a workaround for the scheduler's systemd support (Issue #5640)
+ - Fixed spelling of "fold-accordion".
+ - Fixed the default common name for TLS certificates used by `ippeveprinter`.
+ 
+diff --git a/scheduler/main.c b/scheduler/main.c
+index 842b00a42..d5fdf971a 100644
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -757,7 +757,9 @@ main(int  argc,				/* I - Number of command-line args */
+ #ifdef HAVE_ONDEMAND
+ 	if (OnDemand)
+ 	{
++#  ifndef HAVE_SYSTEMD /* Issue #5640: systemd doesn't actually support launch-on-demand services, need to fake it */
+ 	  stop_scheduler = 1;
++#  endif /* HAVE_SYSTEMD */
+ 	  break;
+ 	}
+ #endif /* HAVE_ONDEMAND */
+-- 
+2.20.1
+
diff --git a/cups.spec b/cups.spec
index 0cdeb29..1b270d9 100644
--- a/cups.spec
+++ b/cups.spec
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+ with exceptions and AML
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -96,6 +96,8 @@ Patch18: cups-filter-debug.patch
 Patch29: cups-dymo-deviceid.patch
 
 #### UPSTREAM PATCHES ####
+# cupsctl does not work in 2.2.12, because systemd does not have launch-on-demand feature
+Patch40: 0001-Add-workaround-for-systemd-s-lack-of-true-launch-on-.patch
 
 ##### Patches removed because IMHO they aren't no longer needed
 ##### but still I'll leave them in git in case their removal
@@ -339,6 +341,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %endif
 
 #### UPSTREAMED PATCHES ####
+# issue saw in upstream #5640
+%patch40 -p1 -b .cupsctl-not-working
 
 # if cupsd is set to log into /var/log/cups, then 'MaxLogSize 0' needs to be
 # in cupsd.conf to disable cupsd logrotate functionality and use logrotated
@@ -745,6 +749,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Fri Sep 13 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.12-2
+- fix cupsctl usage
+
 * Mon Aug 19 2019 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.2.12-1
 - 2.2.12