diff --git a/.gitignore b/.gitignore
index f11e650..3826d70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
 /assetcache-877db25064ea25968f85fa3433c2e1cda52d2ee2.tar.xz
 /openQA-1f44aeb7b7c8f9c9f9ef970c61a13f88908d0d52.tar.gz
 /assetcache-1f44aeb7b7c8f9c9f9ef970c61a13f88908d0d52.tar.xz
+/openQA-663c025329253759af7291ba6e1a0ebed4a01fc5.tar.gz
+/assetcache-663c025329253759af7291ba6e1a0ebed4a01fc5.tar.xz
diff --git a/openqa.spec b/openqa.spec
index 821e7d6..1d1bdb5 100644
--- a/openqa.spec
+++ b/openqa.spec
@@ -23,9 +23,9 @@
 %global github_owner    os-autoinst
 %global github_name     openQA
 %global github_version  4.4
-%global github_commit   1f44aeb7b7c8f9c9f9ef970c61a13f88908d0d52
+%global github_commit   663c025329253759af7291ba6e1a0ebed4a01fc5
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20161022
+%global github_date     20161128
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 # can't use linebreaks here!
@@ -40,7 +40,7 @@ systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || :
 
 Name:           openqa
 Version:        %{github_version}
-Release:        28%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        29%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
 Summary:        OS-level automated testing framework
 License:        GPLv2+
 Url:            http://os-autoinst.github.io/openQA/
@@ -57,13 +57,6 @@ Source1:        assetcache-%{github_commit}.tar.xz
 # an unknown state; I like this, it insulates us from general wackiness
 Patch0:         0001-Revert-Disable-auto-duplication-of-jobs-poo-13042.patch
 
-# Fix worker error reporting when it can't find an asset
-Patch1:         https://github.com/os-autoinst/openQA/pull/963.patch
-
-# Add 'before' and 'after' job query params. Backport of:
-# https://github.com/os-autoinst/openQA/commit/8b49bfc92d48a9dcb5e83b980c5c28164d1dfc27
-Patch2:         0001-API-jobs-list-add-params-before-and-after.patch
-
 # For the httpd subpackage split in 4.3-7, needed for updates to work right
 Obsoletes:      openqa < 4.3-7
 
@@ -226,6 +219,7 @@ grep -rl /usr/bin/env . | while read file; do
 done
 
 mkdir %{buildroot}%{_localstatedir}/lib/openqa/pool/1
+mkdir %{buildroot}%{_localstatedir}/lib/openqa/cache
 
 # We don't do AppArmor
 rm -rf %{buildroot}%{_sysconfdir}/apparmor.d
@@ -300,7 +294,6 @@ fi
 %{_datadir}/openqa/dbicdh
 %{_datadir}/openqa/assets
 %dir %{_datadir}/openqa/script
-%{_datadir}/openqa/script/backlog
 %{_datadir}/openqa/script/check_dependencies
 %{_datadir}/openqa/script/clean_needles
 %{_datadir}/openqa/script/client
@@ -314,7 +307,6 @@ fi
 %{_datadir}/openqa/script/openqa-scheduler
 %{_datadir}/openqa/script/openqa-websockets
 %{_datadir}/openqa/script/upgradedb
-%{_datadir}/openqa/script/migrate_images
 %{_datadir}/openqa/script/modify_needle
 %dir %{_localstatedir}/lib/openqa/share
 %defattr(-,geekotest,root)
@@ -363,6 +355,7 @@ fi
 %{_datadir}/openqa/script/worker
 %dir %{_localstatedir}/lib/openqa/pool
 %defattr(-,_openqa-worker,root)
+%dir %{_localstatedir}/lib/openqa/cache
 # own one pool - to create the others is task of the admin
 %dir %{_localstatedir}/lib/openqa/pool/1
 
@@ -380,6 +373,10 @@ fi
 %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/Fedmsg.pm
 
 %changelog
+* Mon Nov 28 2016 Adam Williamson <awilliam@redhat.com> - 4.4-29.20161128git663c025
+- Bump to latest git (general F25 cycle start bump, lots of new stuff)
+- Port over spec changes from openSUSE
+
 * Thu Nov 10 2016 Adam Williamson <awilliam@redhat.com> - 4.4-28.20161022git1f44aeb
 - Backport patch to add 'before' and 'after' params to the API job query
 
diff --git a/sources b/sources
index 6cea3ad..6db7b22 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-53ae50e401c1b7f558e7ca021d4c6390  openQA-1f44aeb7b7c8f9c9f9ef970c61a13f88908d0d52.tar.gz
-4dcca9791d35a075b1549a0367f07498  assetcache-1f44aeb7b7c8f9c9f9ef970c61a13f88908d0d52.tar.xz
+5b9ec8332af2171702f0eaaf72c97b75  openQA-663c025329253759af7291ba6e1a0ebed4a01fc5.tar.gz
+1a49f24466d7f6cc4e697487c8df02e1  assetcache-663c025329253759af7291ba6e1a0ebed4a01fc5.tar.xz