diff --git a/lirc-dont-exit.patch b/lirc-dont-exit.patch
new file mode 100644
index 0000000..2e71411
--- /dev/null
+++ b/lirc-dont-exit.patch
@@ -0,0 +1,20 @@
+Index: daemons/lircd.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/daemons/lircd.c,v
+retrieving revision 5.77
+diff -u -p -u -p -r5.77 lircd.c
+--- daemons/lircd.c	9 May 2008 18:40:59 -0000	5.77
++++ daemons/lircd.c	14 Aug 2008 08:56:50 -0000
+@@ -518,7 +518,11 @@ void add_client(int sock)
+ 				shutdown(clis[0],2);
+ 				close(clis[0]);
+ 				clin=0;
+-				dosigterm(SIGTERM);
++				/* Don't exit here, otherwise lirc bails out,
++				 * and lircd exits, making it impossible to
++				 * connect to when we have a device actually
++				 * plugged in.
++				dosigterm(SIGTERM); */
+ 			}
+ 		}
+ 	}
diff --git a/lirc.spec b/lirc.spec
index a912787..8544e6e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        5%{?pre:.%{pre}}%{?dist}
+Release:        6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,6 +34,9 @@ Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch3:		lirc-0.8.3-fix-remote-keycodes.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=440231
+# http://thread.gmane.org/gmane.comp.hardware.lirc/6889
+Patch4:		lirc-dont-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -118,6 +121,7 @@ of remote control configuration files.
 %patch0 -p1 -b .incl
 %patch1 -p1 -b .xbuf
 %patch2 -p1 -b .suf
+%patch4 -p0 -b .exit
 
 chmod 644 contrib/*
 
@@ -262,6 +266,11 @@ fi
 
 
 %changelog
+* Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-6
+- Make lircd not exit when there's no device available, so that the
+  daemon is running as expected when the hardware is plugged back in
+  (#440231)
+
 * Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-5
 - Add huge patch to fix the majority of remotes to have sensible keycodes,
   so they work out-of-the-box (#457273)