diff --git a/external/opal-prd/opal-prd.service b/external/opal-prd/opal-prd.service
index dce0dd2..cf514e4 100644
--- a/external/opal-prd/opal-prd.service
+++ b/external/opal-prd/opal-prd.service
@@ -2,6 +2,7 @@
 Description=OPAL PRD daemon
 ConditionVirtualization=false
 ConditionPathExists=/sys/firmware/devicetree/base/ibm,opal/diagnostics
+After=systemd-modules-load.service
 
 [Service]
 ExecStart=/usr/sbin/opal-prd
diff --git a/skiboot.spec b/skiboot.spec
index 38c6868..fbb21b5 100644
--- a/skiboot.spec
+++ b/skiboot.spec
@@ -1,5 +1,5 @@
 Name:		opal-prd
-Version:	5.10
+Version:	6.7
 Release:	1%{?dist}
 Summary:	OPAL Processor Recovery Diagnostics Daemon
 
@@ -11,6 +11,7 @@
 BuildRequires:	systemd
 
 Requires:	systemd
+Requires:	systemd-udev
 
 Source0:	https://github.com/open-power/skiboot/archive/v%{version}.tar.gz
 
@@ -62,6 +63,10 @@
 mkdir -p %{buildroot}%{_unitdir}
 install -m 644 -p external/opal-prd/opal-prd.service %{buildroot}%{_unitdir}/opal-prd.service
 
+# Auto-load kernel module after boot/reboot
+mkdir -p %{buildroot}/%{_sysconfdir}/modules-load.d
+echo 'opal-prd' > %{buildroot}/%{_sysconfdir}/modules-load.d/%{name}.conf
+
 mkdir -p %{buildroot}%{_datadir}/qemu
 install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid
 
@@ -91,6 +96,7 @@
 %{_sbindir}/opal-prd
 %{_unitdir}/opal-prd.service
 %{_mandir}/man8/*
+%config(noreplace) %{_sysconfdir}/modules-load.d/%{name}.conf
 
 %files -n opal-utils
 %doc README.md
@@ -108,6 +114,10 @@
 %{_datadir}/qemu/
 
 %changelog
+* Tue Mar 9 2021 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> - 6.7
+- Update to v6.7 release
+- Create conf file to load opal-prd module at boot
+
 * Thu Mar 01 2018 Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com> - 5.10-1
 - Update to v5.10 release