diff --git a/slurm.spec b/slurm.spec
index 4b67bbfcc8906cf17f089857d647a1b0299e0f57..2388a07015c24454eaadca3937f1fe41e8cacdbc 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -581,10 +581,10 @@ test -f $RPM_BUILD_ROOT/etc/init.d/slurm			&&
   echo /etc/init.d/slurm				>> $LIST
 test -f $RPM_BUILD_ROOT/usr/sbin/rcslurm			&&
   echo /usr/sbin/rcslurm				>> $LIST
-test -f $RPM_BUILD_ROOT/lib/systemd/system/slurmctld.service	&&
-  echo /lib/systemd/system/slurmctld.service		>> $LIST
-test -f $RPM_BUILD_ROOT/lib/systemd/system/slurmd.service	&&
-  echo /lib/systemd/system/slurmd.service		>> $LIST
+test -f $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmctld.service	&&
+  echo /usr/lib/systemd/system/slurmctld.service		>> $LIST
+test -f $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmd.service	&&
+  echo /usr/lib/systemd/system/slurmd.service		>> $LIST
 
 test -f $RPM_BUILD_ROOT/opt/modulefiles/slurm/%{version}-%{release} &&
   echo /opt/modulefiles/slurm/%{version}-%{release} >> $LIST
@@ -656,8 +656,8 @@ test -f $RPM_BUILD_ROOT/etc/init.d/slurmdbd			&&
   echo /etc/init.d/slurmdbd				>> $LIST
 test -f $RPM_BUILD_ROOT/usr/sbin/rcslurmdbd			&&
   echo /usr/sbin/rcslurmdbd				>> $LIST
-test -f $RPM_BUILD_ROOT/lib/systemd/system/slurmdbd.service	&&
-  echo /lib/systemd/system/slurmdbd.service		>> $LIST
+test -f $RPM_BUILD_ROOT/usr/lib/systemd/system/slurmdbd.service	&&
+  echo /usr/lib/systemd/system/slurmdbd.service		>> $LIST
 
 LIST=./sql.files
 touch $LIST
diff --git a/src/api/allocate.c b/src/api/allocate.c
index 373de9a920d350501dad1c113a7cfaf4aa43a961..ee5badb8ab057d34ed77ff9220bbf0d8df2989b1 100644
--- a/src/api/allocate.c
+++ b/src/api/allocate.c
@@ -149,6 +149,11 @@ slurm_allocate_resources (job_desc_msg_t *req,
 	return SLURM_PROTOCOL_SUCCESS;
 }
 
+static void
+cazzo(int sig)
+{
+	info("%s: got signal %d", __func__, sig);
+}
 
 /*
  * slurm_allocate_resources_blocking
@@ -208,6 +213,7 @@ slurm_allocate_resources_blocking (const job_desc_msg_t *user_req,
 		      " forcing immediate allocation mode.");
 		req->immediate = 1;
 	}
+	signal(SIGINT, cazzo);
 
 	if (!req->immediate) {
 		listen = _create_allocation_response_socket(hostname);
diff --git a/src/srun/libsrun/allocate.c b/src/srun/libsrun/allocate.c
index b4d7b360064d8d6d48410757e93d0412d2fe9f74..2cf7949e9caf5903f14c7549ea544e89aeb3ee7e 100644
--- a/src/srun/libsrun/allocate.c
+++ b/src/srun/libsrun/allocate.c
@@ -116,6 +116,9 @@ static void *_safe_signal_while_allocating(void *in_data)
 {
 	int signo = *(int *)in_data;
 
+	fprintf(stderr, "%s: porcoddio signal %d %d\n",
+		__func__, signo, destroy_job);
+
 	debug("Got signal %d", signo);
 	if (signo == SIGCONT)
 		return NULL;
@@ -134,6 +137,9 @@ static void _signal_while_allocating(int signo)
 	pthread_t thread_id;
 	pthread_attr_t thread_attr;
 
+	fprintf(stderr, "%s: porcoddio signal %d %d\n",
+		__func__, signo, destroy_job);
+
 	/* There are places where _signal_while_allocating can't be
 	 * put into a thread, but if this isn't on a separate thread
 	 * and we try to print something using the log functions and