diff --git a/0008-Fix-travis.patch b/0008-Fix-travis.patch
deleted file mode 100644
index 10f839b..0000000
--- a/0008-Fix-travis.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 20aa88df8d23b88bdb8d500bec9c8a9ea4ae2232 Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@suse.com>
-Date: Thu, 1 Dec 2016 14:04:19 +0100
-Subject: [PATCH 8/9] Fix travis
-
-Regression introduced in 0f170a937bd0944e172004dc30df2fc240d9ca20
----
- tests/data/metadata/fence_compute.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
-index 83bdb53..58f77a6 100644
---- a/tests/data/metadata/fence_compute.xml
-+++ b/tests/data/metadata/fence_compute.xml
-@@ -9,7 +9,7 @@
- 		<shortdesc lang="en">Fencing action</shortdesc>
- 	</parameter>
- 	<parameter name="auth-url" unique="0" required="0">
--		<getopt mixed="-k, --auth-url=[tenant]" />
-+		<getopt mixed="-k, --auth-url=[url]" />
- 		<content type="string" default=""  />
- 		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
- 	</parameter>
--- 
-2.10.1
-
diff --git a/_service b/_service
index 984957c..a477595 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="filename">fence-agents</param>
-    <param name="versionformat">4.0.24+git.%ct.%h</param>
+    <param name="versionformat">4.0.25+git.%ct.%h</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>
diff --git a/_servicedata b/_servicedata
index 96dcf97..d3f2c9b 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">git://github.com/ClusterLabs/fence-agents.git</param>
-          <param name="changesrevision">e67fcd49e499b5d6acb9b8892a73a67acfa6ffa4</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">eb43835fc430651712271a046c61eec1c5ecdedb</param></service></servicedata>
\ No newline at end of file
diff --git a/fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz b/fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz
deleted file mode 100644
index 77a5249..0000000
--- a/fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:596cb99c2340debda3d7bed7b9937ff65782889d6f32022b0c04bbef639853f7
-size 210244
diff --git a/fence-agents-4.0.25+git.1485179354.eb43835.tar.xz b/fence-agents-4.0.25+git.1485179354.eb43835.tar.xz
new file mode 100644
index 0000000..87546af
--- /dev/null
+++ b/fence-agents-4.0.25+git.1485179354.eb43835.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cdd559d9ffb536cf2d9e810fbd59a63e9a3cc5d71fa5ffd2fd3611ddbc2c437
+size 211280
diff --git a/fence-agents.changes b/fence-agents.changes
index 994373a..bbbe973 100644
--- a/fence-agents.changes
+++ b/fence-agents.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb 01 16:49:43 UTC 2017 - kgronlund@suse.com
+
+- Update to version 4.0.25+git.1485179354.eb43835:
+  * Ironic fence agent
+  * fencing: Add --quiet option to disable logging to stderr
+  * fence_powerman: fix typo in option powerman-path
+  * fence_cisco_ucs: Commands sent to Cisco UCS are changed to
+
+- Drop merged patch:
+  * Remove 0008-Fix-travis.patch
+
 -------------------------------------------------------------------
 Thu Dec 01 11:38:47 UTC 2016 - kgronlund@suse.com
 
diff --git a/fence-agents.spec b/fence-agents.spec
index 2e36708..6f41195 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fence-agents
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Name:           fence-agents
 Summary:        Fence Agents for Pacemaker from RHCS
 License:        GPL-2.0 and LGPL-2.1
 Group:          Productivity/Clustering/HA
-Version:        4.0.24+git.1480563949.e67fcd4
+Version:        4.0.25+git.1485179354.eb43835
 Release:        0
 Url:            https://github.com/ClusterLabs/fence-agents
 Source0:        %{name}-%{version}.tar.xz
@@ -40,8 +40,6 @@ Patch5:         0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
 Patch6:         0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
 # PATCH-FIX-UPSTREAM: fence_compute: Remove duplicate check for binary name
 Patch7:         0007-fence_compute-Remove-duplicate-check-for-binary-name.patch
-# PATCH-FIX-UPSTREAM: Fix travis regression
-Patch8:         0008-Fix-travis.patch
 # PATCH-FIX-UPSTREAM: fence_compute: Fix disabling force_down on node when action is on
 Patch9:         0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch
 
@@ -113,7 +111,6 @@ fence agents only suitable for development.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 %patch9 -p1
 
 %build