diff --git a/.gitignore b/.gitignore
index 7918214..ea215b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /skiboot-5.1.13.tar.gz
 /skiboot-5.2.0.tar.gz
+/skiboot-5.5.0.tar.gz
diff --git a/opal-prd.service b/opal-prd.service
deleted file mode 100644
index ce4f47a..0000000
--- a/opal-prd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=OPAL PRD daemon
-Requires=opal-prd.socket
-
-[Service]
-StandardInput=socket
-ExecStart=/usr/sbin/opal-prd --pnor /dev/mtd0
-
-[Install]
-WantedBy=multi-user.target
diff --git a/opal-prd.socket b/opal-prd.socket
deleted file mode 100644
index e51b9d3..0000000
--- a/opal-prd.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OPAL PRD Listen Socket
-
-[Socket]
-ListenStream=/run/opal-prd-control
-
-[Install]
-WantedBy=sockets.target
diff --git a/opal-prd.spec b/opal-prd.spec
index 94f4b45..e4bf6f5 100644
--- a/opal-prd.spec
+++ b/opal-prd.spec
@@ -1,6 +1,6 @@
 Name:		opal-prd
-Version:	5.2.0
-Release:	2%{?dist}
+Version:	5.5.0
+Release:	1%{?dist}
 Summary:	OPAL Processor Recovery Diagnostics Daemon
 
 Group:		System Environment/Daemons
@@ -17,9 +17,6 @@ Requires(preun):	systemd
 Requires(postun):	systemd
 
 Source0:	https://github.com/open-power/skiboot/archive/skiboot-%{version}.tar.gz
-Source1:	opal-prd.socket
-Source2:	opal-prd.service
-Patch0:		skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch
 
 %description
 This package provides a daemon to load and run the OpenPower firmware's
@@ -51,7 +48,6 @@ services to the OS (Linux) on IBM Power and OpenPower systems.
 %prep
 
 %setup -q -n skiboot-skiboot-%{version}
-%patch0 -p1 -b .gcc6-builtin-frame-addr-fix
 
 %build
 OPAL_PRD_VERSION=%{version} make V=1 CFLAGS="%{optflags}" -C external/opal-prd
@@ -67,8 +63,7 @@ cp external/pflash/pflash %{buildroot}%{_sbindir}
 cp external/xscom-utils/{get,put}scom %{buildroot}%{_sbindir}
 
 mkdir -p %{buildroot}%{_unitdir}
-install -m 644 -p %{SOURCE1} %{buildroot}%{_unitdir}/opal-prd.socket
-install -m 644 -p %{SOURCE2} %{buildroot}%{_unitdir}/opal-prd.service
+install -m 644 -p external/opal-prd/opal-prd.service %{buildroot}%{_unitdir}/opal-prd.service
 
 mkdir -p %{buildroot}%{_datadir}/qemu
 install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid
@@ -86,7 +81,6 @@ install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid
 %doc README
 %license LICENCE
 %{_sbindir}/opal-prd
-%{_unitdir}/opal-prd.socket
 %{_unitdir}/opal-prd.service
 %{_mandir}/man8/*
 
@@ -105,6 +99,9 @@ install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid
 %{_datadir}/qemu/
 
 %changelog
+* Tue Apr 18 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-1
+- Update to latest upstream 5.5.0
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch b/skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch
deleted file mode 100644
index 14cbcbf..0000000
--- a/skiboot-1.1.13-gcc6-builtin-frame-addr-fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From a6e7d1171f47d58a3e9cef5e517c70abbefc141c Mon Sep 17 00:00:00 2001
-From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
-Date: Mon, 21 Mar 2016 19:30:39 +0530
-Subject: [PATCH] core/stack: Fix __builtin_frame_address issue
-
-GCC 6 warns if we pass nonzero values to __builtin_frame_address().
-Hence reorganize the code and pass zero to __builtin_frame_address().
-
-core/stack.c: In function '__backtrace':
-core/stack.c:34:17: error: calling '__builtin_frame_address' with a
-nonzero argument is unsafe [-Werror=frame-address]
-  unsigned long *fp = __builtin_frame_address(1);
-
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- core/stack.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/core/stack.c b/core/stack.c
-index 5fba6c7..5024135 100644
---- a/core/stack.c
-+++ b/core/stack.c
-@@ -31,15 +31,19 @@ extern uint32_t _stext, _etext;
- void __nomcount __backtrace(struct bt_entry *entries, unsigned int *count)
- {
- 	unsigned int room = *count;
--	unsigned long *fp = __builtin_frame_address(1);
-+	unsigned long *fp = __builtin_frame_address(0);
- 	unsigned long top_adj = top_of_ram;
- 
- 	/* Assume one stack for early backtraces */
- 	if (top_of_ram == SKIBOOT_BASE + SKIBOOT_SIZE)
- 		top_adj = top_of_ram + STACK_SIZE;
- 
-+	if (!fp || (unsigned long)fp > top_adj)
-+		return;
-+
- 	*count = 0;
- 	while(room) {
-+		fp = (unsigned long *)fp[0];
- 		if (!fp || (unsigned long)fp > top_adj)
- 			break;
- 		entries->sp = (unsigned long)fp;
-@@ -47,7 +51,6 @@ void __nomcount __backtrace(struct bt_entry *entries, unsigned int *count)
- 		entries++;
- 		*count = (*count) + 1;
- 		room--;
--		fp = (unsigned long *)fp[0];
- 	}
- }
- 
--- 
-2.5.0
-
diff --git a/sources b/sources
index 589396c..02f084e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d30d7fb16d167557c3db05f5f0984367  skiboot-5.2.0.tar.gz
+SHA512 (skiboot-5.5.0.tar.gz) = 7fc00168b45e49ba9c3aba29bae81d1f3e387bd8ae023297eb9e52b0ac165fedf06e651e824b02a4b198eff7f33dc1c036f64a1fd14ad93fb542224bd8db34e9