diff --git a/cmpi-bindings-0.9.5-python-lib-dir.patch b/cmpi-bindings-0.9.5-python-lib-dir.patch
new file mode 100644
index 0000000..01dde42
--- /dev/null
+++ b/cmpi-bindings-0.9.5-python-lib-dir.patch
@@ -0,0 +1,12 @@
+diff -up cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old cmpi-bindings-0.9.5/swig/python/CMakeLists.txt
+--- cmpi-bindings-0.9.5/swig/python/CMakeLists.txt.old	2013-08-06 15:57:03.576285764 +0200
++++ cmpi-bindings-0.9.5/swig/python/CMakeLists.txt	2013-08-06 15:57:14.891345941 +0200
+@@ -9,7 +9,7 @@ SET (BUILD_SHARED_LIBS ON)
+ 
+ FIND_PACKAGE(PythonInterp REQUIRED)
+ 
+-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_LIB_DIR)
++EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))" OUTPUT_VARIABLE PYTHON_LIB_DIR)
+ 
+ IF (NOT PYTHON_SITE_DIR)
+   SET (PYTHON_SITE_DIR ${PYTHON_LIB_DIR})
diff --git a/cmpi-bindings.spec b/cmpi-bindings.spec
index 6cf833e..3dd790b 100644
--- a/cmpi-bindings.spec
+++ b/cmpi-bindings.spec
@@ -1,6 +1,6 @@
 Name:           cmpi-bindings
 Version:        0.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Adapter to write and run CMPI-type CIM providers
 
 Group:          Development/Libraries
@@ -12,6 +12,8 @@ Source0:        https://github.com/kkaempf/%{name}/archive/v%{version}.tar.gz
 Patch0:         cmpi-bindings-0.4.17-no-ruby-perl.patch
 #Patch1: removes workaround no longer needed
 Patch1:         cmpi-bindings-0.4.17-sblim-sigsegv.patch
+#Patch2: fixes placement of *.py[co] file
+Patch2:         cmpi-bindings-0.9.5-python-lib-dir.patch
 
 BuildRequires:  cmake gcc-c++ swig >= 1.3.34
 BuildRequires:  curl-devel pkgconfig sed
@@ -35,6 +37,7 @@ CMPI-compliant provider interface for Python
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .python-lib-dir
 
 # change hardcoded path from /usr/lib/pycim/ to something better
 sed -i 's@/usr/lib/pycim/@'`echo %{python_sitelib}/pycim/`'@' swig/python/cmpi_pywbem_bindings.py
@@ -69,6 +72,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/cmpi
 make install DESTDIR=$RPM_BUILD_ROOT
 # create directory for providers
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}/pycim/
+rmdir $RPM_BUILD_ROOT%{_datadir}/cmpi
 
 
 %clean
@@ -80,12 +84,15 @@ rm -rf $RPM_BUILD_ROOT
 %doc README ANNOUNCE COPYING LICENSE.BSD README.Fedora
 %dir %{_libdir}/cmpi
 %{_libdir}/cmpi/libpyCmpiProvider.so
-%dir %{_datadir}/cmpi
-%{python_sitelib}/cmpi_pywbem_bindings.py*
-%{python_sitelib}/cmpi.py*
+%{python_sitearch}/cmpi_pywbem_bindings.py*
+%{python_sitearch}/cmpi.py*
 %dir %{python_sitelib}/pycim/
 
 %changelog
+* Tue Aug 06 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 0.9.5-4
+- Fix placement of *.py[co] files
+- Remove /usr/share/cmpi - it's used by ruby binding that we don't build
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild