diff -up ppc64-diag-2.7.4/scripts/Makefile.am.script_loc ppc64-diag-2.7.4/scripts/Makefile.am
--- ppc64-diag-2.7.4/scripts/Makefile.am.script_loc	2017-07-24 00:43:44.000000000 -0400
+++ ppc64-diag-2.7.4/scripts/Makefile.am	2017-09-16 10:21:58.786296122 -0400
@@ -11,21 +11,22 @@ INIT_FILES = scripts/rtas_errd scripts/o
 SERVICE_SCRIPT = scripts/rtas_errd.service scripts/opal_errd.service
 
 install-exec-hook-scripts:
+	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
+	install -D --mode=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/usr/libexec/ppc64-diag/
 	install -d --mode=755 $(DESTDIR)/etc/ppc64-diag/
-	install -D --mode=744 $(PPC64_DIAG_SCRIPT) $(DESTDIR)/etc/ppc64-diag/
-	install -D --mode=644 $(CONFIG_FILE) $(DESTDIR)/etc/ppc64-diag
+	install -D --mode=644 $(CONFIG_FILE) $(DESTDIR)/etc/ppc64-diag/
 	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
 	install -D --mode=755 $(INIT_FILES) $(DESTDIR)/usr/libexec/ppc64-diag/
 	install -d --mode=755 $(DESTDIR)/usr/lib/systemd/system/
 	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)/usr/lib/systemd/system/
 
 uninstall-hook-scripts:
-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_setup
-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_mkrsrc
-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_notify
-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_migrate
-	rm -f $(DESTDIR)/etc/ppc64-diag/servevent_parse.pl
-	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64-diag.config
+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_setup
+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_mkrsrc
+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_notify
+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64_diag_migrate
+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/servevent_parse.pl
+	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/ppc64-diag.config
 	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/rtas_errd
 	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/opal_errd
 	rm -f $(DESTDIR)/usr/lib/systemd/system/rtas_errd.service
diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc
--- ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc.script_loc	2017-07-24 00:43:44.000000000 -0400
+++ ppc64-diag-2.7.4/scripts/ppc64_diag_mkrsrc	2017-09-16 10:21:15.736295426 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -I /etc/ppc64-diag
+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
 #
 # This script is to be registered with servicelog as a notification tool.  It
 # is responsible for creating a new IBM.ServiceEvent RMC resource when a
@@ -27,7 +27,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-require "/etc/ppc64-diag/servevent_parse.pl";
+require "/usr/libexec/ppc64-diag/servevent_parse.pl";
 
 # Check to make sure that devices.chrp.base.ServiceRM is installed
 $rc = system("which rpm >/dev/null 2>&1");
diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_notify.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_notify
--- ppc64-diag-2.7.4/scripts/ppc64_diag_notify.script_loc	2017-07-24 00:43:44.000000000 -0400
+++ ppc64-diag-2.7.4/scripts/ppc64_diag_notify	2017-09-16 10:21:15.736295426 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -I /etc/ppc64-diag
+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
 #
 # This script is to be registered with servicelog as a notification tool.  It
 # is responsible for sending out e-mail notifications of new ppc64 platform
@@ -22,7 +22,7 @@
  
 use Getopt::Long;
 
-require "/etc/ppc64-diag/servevent_parse.pl";
+require "/usr/libexec/ppc64-diag/servevent_parse.pl";
 
 sub usage {
 	print "$0 [OPTIONS]\n";
diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_servagent.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_servagent
--- ppc64-diag-2.7.4/scripts/ppc64_diag_servagent.script_loc	2017-07-24 00:43:44.000000000 -0400
+++ ppc64-diag-2.7.4/scripts/ppc64_diag_servagent	2017-09-16 10:21:15.736295426 -0400
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -I /etc/ppc64-diag
+#! /usr/bin/perl -I /usr/libexec/ppc64-diag
 #
 # This script is to be registered with servicelog as a notification tool.  It
 # is responsible for invoking Electronic Service Agent in response to a
@@ -25,7 +25,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
-require "/etc/ppc64-diag/servevent_parse.pl";
+require "/usr/libexec/ppc64-diag/servevent_parse.pl";
 
 if (!-e "/usr/svcagent/bin/callsa2") {
 	# eSA is not installed; exit quietly
diff -up ppc64-diag-2.7.4/scripts/ppc64_diag_setup.script_loc ppc64-diag-2.7.4/scripts/ppc64_diag_setup
--- ppc64-diag-2.7.4/scripts/ppc64_diag_setup.script_loc	2017-07-24 00:43:44.000000000 -0400
+++ ppc64-diag-2.7.4/scripts/ppc64_diag_setup	2017-09-16 10:21:15.736295426 -0400
@@ -89,15 +89,15 @@ sub unregister {
 
 @notification_tools = (
 
-    ["/etc/ppc64-diag/ppc64_diag_notify -q -e root -l /var/log/platform",
+    ["/usr/libexec/ppc64-diag/ppc64_diag_notify -q -e root -l /var/log/platform",
      "--match='serviceable=1' ".
      "--type=EVENT --method=pairs_stdin"],
 
-    ["/etc/ppc64-diag/ppc64_diag_mkrsrc",
+    ["/usr/libexec/ppc64-diag/ppc64_diag_mkrsrc",
      "--match='serviceable=1' ".
      "--type=EVENT --method=pairs_stdin"],
 
-    ["/etc/ppc64-diag/ppc64_diag_migrate",
+    ["/usr/libexec/ppc64-diag/ppc64_diag_migrate",
      "--match=\'refcode=\"#MIGRATE\" and serviceable=0\' ".
      "--type=EVENT --method=pairs_stdin"],
 );
diff -up ppc64-diag-2.7.4/scripts/rtas_errd.script_loc ppc64-diag-2.7.4/scripts/rtas_errd
--- ppc64-diag-2.7.4/scripts/rtas_errd.script_loc	2017-09-16 10:21:15.726295425 -0400
+++ ppc64-diag-2.7.4/scripts/rtas_errd	2017-09-16 10:21:15.736295426 -0400
@@ -69,7 +69,7 @@ case "$1" in
 		echo "registering ppc64-diag with system"
 		rm -f /var/cache/ppc64-diag.registered
 		mkdir -v /var/cache/ppc64-diag.registered
-		/etc/ppc64-diag/ppc64_diag_setup --register
+		/usr/libexec/ppc64-diag/ppc64_diag_setup --register
 	fi
 	echo -n "Starting rtas_errd (platform error handling) daemon: "
 	if [ $INSSERV -eq 1 ]; then