diff --git a/0000-hotfix.patch b/0000-hotfix.patch
deleted file mode 100644
index 4a9294a..0000000
--- a/0000-hotfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libguestfs-1.36.4/v2v/convert_linux.ml
-===================================================================
---- libguestfs-1.36.4.orig/v2v/convert_linux.ml
-+++ libguestfs-1.36.4/v2v/convert_linux.ml
-@@ -514,7 +514,9 @@ let rec convert (g : G.guestfs) inspect
-       else if family = `SUSE_family
-            && g#is_file ~followsymlinks:true "/sbin/mkinitrd" then (
-         ignore (
--          g#command [| "/sbin/mkinitrd";
-+          g#command [| "/usr/bin/env";
-+                       "rootdev=" ^ inspect.i_root;
-+                       "/sbin/mkinitrd";
-                        "-m"; String.concat " " modules;
-                        "-i"; initrd;
-                        "-k"; kernel.ki_vmlinuz;
diff --git a/libguestfs-1.36.4.tar.xz b/libguestfs-1.36.4.tar.xz
deleted file mode 100644
index d83bbf0..0000000
--- a/libguestfs-1.36.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9bc559fb1b5339dd7a74f834263480b857d3c4d4dc275abc8e3087ef6e6deaa
-size 6550456
diff --git a/libguestfs-1.36.5.tar.gz b/libguestfs-1.36.5.tar.gz
new file mode 100644
index 0000000..9111c1d
--- /dev/null
+++ b/libguestfs-1.36.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2f7c10c42de04567a9b5cfd8345a995fb951ded9a7fbe72fae061d66dfe8f98
+size 23012703
diff --git a/libguestfs.changes b/libguestfs.changes
index f0f0134..225210d 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Sun Jul 16 09:07:22 UTC 2017 - dmueller@suse.com
+
+- update to version 1.36.5:
+  * btrfs_replace: fix position of subcommand options
+  * lib: Move close_file_descriptors into guestfs-internal.h.
+  * daemon: lvm: Pass --yes option to force pvresize (RHBZ#1460577).
+  * lib: direct, uml: Unblock SIGTERM in the hypervisor and recovery processes (RHBZ#1460338).
+  * lib: create: Allow any [[:alnum:]]+ string as a backingfmt parameter (RHBZ#1459979).
+  * mllib: Handle empty files correctly in read_first_line_from_file.
+  * resize: make sure the input disk is read-only
+  * v2v: tell v2v the real root device to mkinitrd
+  * mllib: Export which in "stdlib mode".
+  * mllib: Export prog, quiet, trace, verbose in "stdlib mode".
+  * btrfs_replace: fix position of subcommand options
+- drop 0000-hotfix.patch
+- add download location for source verification purposes
+
 -------------------------------------------------------------------
 Thu Jun  1 16:12:07 UTC 2017 - cbosdonnat@suse.com
 
diff --git a/libguestfs.spec b/libguestfs.spec
index e4e47d3..58c35f4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libguestfs
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
 # needsbinariesforbuild
 
 
-Version:        1.36.4
+Version:        1.36.5
 Release:        0
 %{ocaml_preserve_bytecode}
 
@@ -70,7 +70,6 @@ Name:           libguestfs
 %if "%{?_ignore_exclusive_arch}" == ""
 ExclusiveArch:  x86_64 ppc64 ppc64le s390x aarch64
 %endif
-%{ocaml_preserve_bytecode}
 BuildRequires:  aaa_base
 BuildRequires:  attr-devel
 BuildRequires:  augeas-devel >= 1.0.0
@@ -140,10 +139,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Compatibility package for guestfs-tools
 License:        GPL-2.0
 Group:          System/Filesystems
-Patch0:         0000-hotfix.patch
 Patch100:       appliance.patch
 
-Source0:        %{name}-%{version}.tar.xz
+Source0:        http://download.libguestfs.org/1.36-stable/libguestfs-%{version}.tar.gz
 Source1:        libguestfs.rpmlintrc
 Source100:      mount-rootfs-and-chroot.sh
 Source789653:   Pod-Simple-3.23.tar.xz
@@ -200,7 +198,7 @@ Requires:       perl(Win::Hivex)
 Requires:       perl(Win::Hivex::Regedit)
 %endif
 %endif
-Requires:       guestfs-data
+Requires:       guestfs-data >= %{version}
 
 %if %{with fuse}
 Requires:       fuse
@@ -210,7 +208,6 @@ Requires:       fuse
 Requires:       curl
 Requires:       gpg2
 Requires:       xz
-Conflicts:      guestfs-data < %{version}
 Conflicts:      libguestfs0 < %{version}
 
 %description -n guestfs-tools
@@ -244,9 +241,9 @@ This package is only required for building the appliance.
 %if %{with ocaml_bindings}
 %package -n ocaml-libguestfs
 Summary:        Provides OCaml support for libguestfs
+#
 License:        GPL-2.0
 Group:          System/Filesystems
-#
 
 %description -n ocaml-libguestfs
 Allows OCaml scripts to directly use libguestfs.
@@ -294,6 +291,7 @@ Summary:        Provides Lua support for libguestfs
 License:        GPL-2.0
 Group:          System/Filesystems
 BuildRequires:  lua-devel
+Requires:       guestfs-data >= %{version}
 %define _configure_lua --enable-lua
 #
 
@@ -313,6 +311,7 @@ BuildRequires:  python-devel
 #
 Provides:       libguestfs-python = %{version}
 Obsoletes:      libguestfs-python < %{version}
+Requires:       guestfs-data >= %{version}
 
 %description -n python-libguestfs
 Allows Python scripts to directly use libguestfs.
@@ -326,6 +325,7 @@ Group:          System/Filesystems
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:  rubygem-rake
+Requires:       guestfs-data >= %{version}
 %define _configure_ruby --enable-ruby
 #
 
@@ -526,7 +526,6 @@ It can import a variety of guest operating systems from libvirt-managed hosts.
 %prep
 : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
 %setup -q -a 789653
-%patch0 -p1
 %patch100 -p1
 
 %build