diff --git a/libvirt.spec b/libvirt.spec
index f237558..b31d8a9 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -80,6 +80,7 @@
 %define with_firewalld     0%{!?_without_firewalld:0}
 %define with_libssh2       0%{!?_without_libssh2:0}
 %define with_wireshark     0%{!?_without_wireshark:0}
+%define with_libssh        0%{!?_without_libssh:0}
 %define with_pm_utils      1
 
 # Finally set the OS / architecture specific special cases
@@ -172,6 +173,11 @@
     %define with_wireshark 0%{!?_without_wireshark:1}
 %endif
 
+# Enable libssh transport for new enough distros
+%if 0%{?fedora}
+    %define with_libssh 0%{!?_without_libssh:1}
+%endif
+
 
 %if %{with_qemu} || %{with_lxc} || %{with_uml}
 # numad is used to manage the CPU and memory placement dynamically,
@@ -220,7 +226,7 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 2.4.0
+Version: 2.5.0
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
@@ -418,6 +424,10 @@ BuildRequires: wireshark-devel >= 1.12.1
     %endif
 %endif
 
+%if %{with_libssh}
+BuildRequires: libssh-devel >= 0.7.0
+%endif
+
 Provides: bundled(gnulib)
 
 %description
@@ -1210,9 +1220,9 @@ rm -fr %{buildroot}
 # Avoid using makeinstall macro as it changes prefixes rather than setting
 # DESTDIR. Newer make_install macro would be better but it's not available
 # on RHEL 5, thus we need to expand it here.
-make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir}
+make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir}
 
-make -C examples distclean
+make %{?_smp_mflags} -C examples distclean
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -1290,7 +1300,6 @@ rm -fr %{buildroot}
 
 %check
 cd tests
-make
 # These tests don't current work in a mock build root
 for i in nodeinfotest seclabeltest
 do
@@ -1299,7 +1308,7 @@ do
   printf '#!/bin/sh\nexit 0\n' > $i
   chmod +x $i
 done
-if ! make check VIR_TEST_DEBUG=1
+if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=1
 then
   cat test-suite.log || true
   exit 1
@@ -1580,6 +1589,7 @@ exit 0
 
 %if %{with_systemd}
 %{_unitdir}/libvirtd.service
+%{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
 %{_unitdir}/virtlogd.socket
 %{_unitdir}/virtlockd.service
@@ -1831,7 +1841,6 @@ exit 0
 %{_datadir}/libvirt/schemas/storagevol.rng
 
 %{_datadir}/libvirt/cpu_map.xml
-%{_datadir}/libvirt/libvirtLogo.png
 
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 
@@ -1893,6 +1902,9 @@ exit 0
 
 
 %changelog
+* Mon Dec  5 2016 Daniel P. Berrange <berrange@redhat.com> - 2.5.0-1
+- Rebase to version 2.5.0
+
 * Wed Nov  2 2016 Daniel P. Berrange <berrange@redhat.com> - 2.4.0-1
 - Rebase to version 2.4.0
 
diff --git a/sources b/sources
index cd11793..dd51ba5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53ebd616857333fc3ce4dea3db986488  libvirt-2.4.0.tar.xz
+001af1ca2545971c6b46628678fd4afa  libvirt-2.5.0.tar.xz