diff --git a/.gitignore b/.gitignore
index 15c3c37..9c3ec85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /skiboot-6.0.4.tar.gz
 /skiboot-6.1.tar.gz
 /skiboot-6.2.tar.gz
+/skiboot-6.3.1.tar.gz
diff --git a/opal-prd.spec b/opal-prd.spec
index db0f4ef..547c0d6 100644
--- a/opal-prd.spec
+++ b/opal-prd.spec
@@ -1,8 +1,8 @@
 %global project skiboot
 
 Name:		opal-prd
-Version:	6.2
-Release:	4%{?dist}
+Version:	6.3.1
+Release:	1%{?dist}
 Summary:	OPAL Processor Recovery Diagnostics Daemon
 
 License:	ASL 2.0
@@ -26,7 +26,6 @@ Source0: https://github.com/open-power/%{project}/archive/v%{version}/%{project}
 Source1: opal-prd-rsyslog
 Source2: opal-prd-logrotate
 Patch1: skiboot-6.1-annocheck.patch
-Patch2: skiboot-6.2-warning.patch
 
 %description
 This package provides a daemon to load and run the OpenPower firmware's
@@ -89,8 +88,8 @@ install -m 644 -p skiboot.lid.xz %{buildroot}%{_datadir}/qemu/skiboot.lid.xz
 
 # log opal-prd messages to /var/log/opal-prd.log
 mkdir -p %{buildroot}%{_sysconfdir}/{rsyslog.d,logrotate.d}
-install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rsyslog.d/opal-prd 
-install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.conf
+install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/rsyslog.d/opal-prd.conf
+install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/opal-prd
 
 %post
 %systemd_post opal-prd.service
@@ -104,8 +103,8 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.co
 %files
 %doc README.md
 %license LICENCE
-%config(noreplace) %{_sysconfdir}/logrotate.d/10-opal-prd.conf
-%config(noreplace) %{_sysconfdir}/rsyslog.d/opal-prd 
+%config(noreplace) %{_sysconfdir}/logrotate.d/opal-prd
+%config(noreplace) %{_sysconfdir}/rsyslog.d/opal-prd.conf
 %{_sbindir}/opal-prd
 %{_unitdir}/opal-prd.service
 %{_mandir}/man8/*
@@ -126,6 +125,10 @@ install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/logrotate.d/10-opal-prd.co
 %{_datadir}/qemu/
 
 %changelog
+* Fri May 24 2019 Than Ngo <than@redhat.com> - 6.3.1-1
+- update to 6.3.1
+- log messages to /var/log/opal-prd.log
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/skiboot-6.2-warning.patch b/skiboot-6.2-warning.patch
deleted file mode 100644
index 46db544..0000000
--- a/skiboot-6.2-warning.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/libflash/ecc.c b/libflash/ecc.c
-index 9ed9015af..e920dfa98 100644
---- a/libflash/ecc.c
-+++ b/libflash/ecc.c
-@@ -177,7 +177,7 @@ static int eccbyte(uint64_t *dst, struct ecc64 *src)
- 	return 0;
- }
- 
--static uint64_t *inc_uint64_by(const uint64_t *p, uint64_t i)
-+static uint64_t *inc_uint64_by(const void *p, uint64_t i)
- {
- 	return (uint64_t *)(((char *)p) + i);
- }
-diff --git a/libflash/libffs.c b/libflash/libffs.c
-index 221c2b024..4eb0ffa99 100644
---- a/libflash/libffs.c
-+++ b/libflash/libffs.c
-@@ -522,7 +522,7 @@ int ffs_part_info(struct ffs_handle *ffs, uint32_t part_idx,
- 		n = calloc(1, FFS_PART_NAME_MAX + 1);
- 		if (!n)
- 			return FLASH_ERR_MALLOC_FAILED;
--		strncpy(n, ent->name, FFS_PART_NAME_MAX);
-+		strncpy(n, ent->name, FFS_PART_NAME_MAX + 1);
- 		*name = n;
- 	}
- 	return 0;
diff --git a/sources b/sources
index c48dafc..677ac70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (skiboot-6.2.tar.gz) = c2751120e366cd60a4622bfca6176e21497ef766509b3e2d9bb6831ccf7eaa2d3485537228e3f2c5977f8d8cd7cbff6e9888ebd39d506627a06b740b8e04d127
+SHA512 (skiboot-6.3.1.tar.gz) = ad2156d864cedcf3d19e8ff094d12059703aaf9a5ea8403e230ecf33d331dae45e0f28a89c65ad05f94605e493bc8d42df92698847600810d5609bc56ade24b8