diff --git a/python-pyvmomi.changes b/python-pyvmomi.changes
index e586c26..266e857 100644
--- a/python-pyvmomi.changes
+++ b/python-pyvmomi.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Nov 29 15:01:48 UTC 2017 - boris@steki.net
+
+- updated to release v6.5.0.2017.5-1
+  + Fix SoapAdapter serializer to support serializing unicode chars
+  + Remove custom getattr in _HTTPSConnection
+  + Add user-agent header when connecting to vsphere
+- moved to single spec logic to build py2 and py3 package
+  
+
 -------------------------------------------------------------------
 Sun Jan 15 11:57:13 UTC 2017 - hpj@urpla.net
 
diff --git a/python-pyvmomi.spec b/python-pyvmomi.spec
index 72b7969..63abbf6 100644
--- a/python-pyvmomi.spec
+++ b/python-pyvmomi.spec
@@ -17,53 +17,71 @@
 #
 
 
+# They have released version to hotfix issue so this "thing"
+%define hotfix  1
+%if %{defined hotfix}
+%define  version_suffix  -%{hotfix}
+%endif
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%bcond_with     test
+
 Name:           python-pyvmomi
-Version:        6.5
+Version:        6.5.0.2017.5
 Release:        0
 Summary:        VMware vSphere Python SDK
 License:        Apache-2.0
 Group:          Development/Languages/Python
 Url:            https://github.com/vmware/pyvmomi
-Source:         https://pypi.io/packages/source/p/pyvmomi/pyvmomi-%{version}.tar.gz
-BuildRequires:  python-devel
-BuildRequires:  python-fixtures >= 1.3.0
-BuildRequires:  python-requests >= 2.3.0
-BuildRequires:  python-setuptools
-BuildRequires:  python-six >= 1.7.3
-BuildRequires:  python-testtools >= 0.9.34
-BuildRequires:  python-vcrpy
-Requires:       python-requests >= 2.3.0
-Requires:       python-six >= 1.7.3
+Source:         https://pypi.io/packages/source/p/pyvmomi/pyvmomi-%{version}%{?version_suffix}.tar.gz
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module fixtures >= 1.3.0}
+BuildRequires:  %{python_module requests >= 2.3.0}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six >= 1.7.3}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+%if %{with test}
+BuildRequires:  %{python_module testtools >= 0.9.34}
+%endif
+BuildRequires:  %{python_module vcrpy}
+Requires:       %{python_module requests >= 2.3.0}
+Requires:       %{python_module six >= 1.7.3}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
+%python_subpackages
+
 %description
 pyVmomi is the Python SDK for the VMware vSphere API that allows you to manage
 ESX, ESXi, and vCenter.
 
 %prep
-%setup -q -n pyvmomi-%{version}
+%setup -q -n pyvmomi-%{version}%{?version_suffix}
 # we don't want to install any of these
 sed -i '/   data_files/,+1d' setup.py
 # fix line breaks in text files
 sed -i 's/\r//' *.txt
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+%if %{with test}
 %check
-#export PYTHONPATH=%{buildroot}%{python_sitelib}
-#cd %{buildroot}%{python_sitelib}
-python setup.py test
+#export PYTHONPATH=%%{buildroot}%%{python_sitelib}
+#cd %%{buildroot}%%{python_sitelib}
+%python_expand setup.py test
+%endif
 
-%files
+%files %python_files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt README.rst
 %{python_sitelib}/pyVim
 %{python_sitelib}/pyVmomi
-%{python_sitelib}/pyvmomi-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/pyvmomi-%{version}*-py%{py_ver}.egg-info
 
 %changelog
diff --git a/pyvmomi-6.5.0.2017.5-1.tar.gz b/pyvmomi-6.5.0.2017.5-1.tar.gz
new file mode 100644
index 0000000..5d354cd
--- /dev/null
+++ b/pyvmomi-6.5.0.2017.5-1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c28292594281901e894c39a0c06b4126a9c019b3d804c47fb116472299dbb42d
+size 252077
diff --git a/pyvmomi-6.5.tar.gz b/pyvmomi-6.5.tar.gz
deleted file mode 100644
index d48c45c..0000000
--- a/pyvmomi-6.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa6a31c747a7d7042a2ad90e7895cab824ba036dcf26ff2f84374e150eac6dfa
-size 250996