diff --git a/open-vm-tools-stable-10.0.7.tar.gz b/open-vm-tools-stable-10.0.7.tar.gz
new file mode 100644
index 0000000..a4db33e
--- /dev/null
+++ b/open-vm-tools-stable-10.0.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87d76dc3affd39dccfae80c7210ac89e8f14cb493a651709780f67b1b5a92ec8
+size 3038018
diff --git a/open-vm-tools.changes b/open-vm-tools.changes
index 396204c..4d73dc8 100644
--- a/open-vm-tools.changes
+++ b/open-vm-tools.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Apr 29 17:32:37 UTC 2016 - afaerber@suse.de
+
+- Sanitize the filename handling some more. The official GitHub
+  filename is open-vm-tools-stable-10.0.7.tar.gz.
+
+-------------------------------------------------------------------
+Thu Apr 28 15:33:30 UTC 2016 - ken@suse.com
+
+- Update to 10.0.7 stable branch
+  + Added namespace command line utility "vmware-namespace-cmd".
+
 -------------------------------------------------------------------
 Fri Apr 22 12:12:09 UTC 2016 - jslaby@suse.com
 
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index b227b03..ff95ec2 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -69,14 +69,14 @@
 
 Name:           open-vm-tools
 %define subname open-vm-tools
-%define tarname stable
-Version:        10.0.5
+%define tarname open-vm-tools-stable
+Version:        10.0.7
 Release:        0
 Summary:        Open Virtual Machine Tools
 License:        BSD-3-Clause and GPL-2.0 and LGPL-2.1
 Group:          System/Emulators/PC
 Url:            https://github.com/vmware/open-vm-tools
-Source:         https://github.com/vmware/open-vm-tools/archive/%{tarname}-%{version}.tar.gz
+Source:         https://github.com/vmware/open-vm-tools/archive/stable-%{version}.tar.gz#/%{tarname}-%{version}.tar.gz
 Source1:        vmtoolsd
 Source2:        vmtoolsd.service
 Source3:        vmware-user-autostart.desktop
@@ -235,7 +235,7 @@ Those are the development headers for libvmtools. They are needed
 if you intend to create own plugins for vmtoolsd.
 
 %prep
-%setup -q -n %{name}-%{tarname}-%{version}/%{subname}
+%setup -q -n %{tarname}-%{version}/%{subname}
 # fix for an rpmlint warning regarding wrong line feeds
 sed -i -e "s/\r//" README
 %patch0 -p1
@@ -496,6 +496,7 @@ rm -rf %{buildroot}
 %{_bindir}/vmhgfs-fuse
 %{_bindir}/vmware-checkvm
 %{_bindir}/vmware-hgfsclient
+%{_bindir}/vmware-namespace-cmd
 %{_bindir}/vmware-rpctool
 %{_bindir}/vmware-toolbox-cmd
 %{_bindir}/vmware-xferlogs
diff --git a/stable-10.0.5.tar.gz b/stable-10.0.5.tar.gz
deleted file mode 100644
index a0a26b4..0000000
--- a/stable-10.0.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:405eae50c9edacabc01ba4bc73b3bae2882c47518c4bae1bd1b631d341772706
-size 3580818