diff --git a/.gitignore b/.gitignore
index a7bcca5..9590d53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /omniORBpy-3.7.tar.bz2
 /omniORBpy-4.2.0.tar.bz2
 /omniORBpy-4.2.1.tar.bz2
+/omniORBpy-4.2.2.tar.bz2
diff --git a/omniORBpy.spec b/omniORBpy.spec
index ff1b09d..471e8f8 100644
--- a/omniORBpy.spec
+++ b/omniORBpy.spec
@@ -1,17 +1,12 @@
 Name:           omniORBpy
-Version:        4.2.1
-Release:        4%{?dist}
+Version:        4.2.2
+Release:        1%{?dist}
 Summary:        CORBA ORB for Python
 
 License:        LGPLv2+
 URL:            http://omniorb.sourceforge.net/
 Source0:        http://sourceforge.net/projects/omniorb/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
-# Fix FSF addresses
-# find . -type f -print0 | xargs -0 sed -i 's|59 Temple Place\s*. Suite 330,|51 Franklin Street, Fifth Floor,|'
-# find . -type f -print0 | xargs -0 sed -i 's|02111-1307|02110-1301|'
-Patch0:         omniORBpy_fsfaddr.patch
-
 BuildRequires:  omniORB-devel
 BuildRequires:  python2-devel
 BuildRequires:  openssl-devel
@@ -20,28 +15,19 @@ BuildRequires:  openssl-devel
 omniORBpy is a robust high-performance CORBA ORB for Python.
 
 
-%package -n python-omniORB
+%package -n python2-omniORB
 Summary:        CORBA ORB for Python
-BuildArch:      noarch
-Requires:       %{name}-libs = %{version}-%{release}
 # For %%{python2_sitelib}/omniidl_be
 Requires:       omniORB
+%{?python_provide:%python_provide python2-omniORB}
+Obsoletes:      omniORBpy-libs
 
-%description -n python-omniORB
+%description -n python2-omniORB
 Robust high-performance CORBA ORB for Python.
 
 
-%package -n omniORBpy-libs
-Summary:        Libraries for the CORBA ORB for Python
-Requires:       python-omniORB = %{version}-%{release}
-
-%description -n omniORBpy-libs
-Libraries for the CORBA ORB for Python.
-
-
 %package -n omniORBpy-devel
 Summary:        C++ API for the CORBA ORB for Python
-Requires:       python-omniORB = %{version}-%{release}
 Requires:       omniORB-devel
 BuildArch:      noarch
 
@@ -50,13 +36,12 @@ C++ API for the CORBA ORB for Python.
 
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -p1
 
 
 %build
 %configure --with-omniorb=%{_prefix} --with-openssl=%{_prefix}
-make %{?_smp_mflags}
+%make_build
 
 
 %install
@@ -74,7 +59,7 @@ chmod +x %{buildroot}%{python2_sitearch}/*.so.*
 find %{buildroot}%{python2_sitelib} -type d -exec chmod 755 {} \;
 
  
-%files -n python-omniORB
+%files -n python2-omniORB
 %doc README.Python README.txt ReleaseNotes.txt update.log
 %license COPYING.LIB
 %{python2_sitelib}/CosNaming*
@@ -84,17 +69,19 @@ find %{buildroot}%{python2_sitelib} -type d -exec chmod 755 {} \;
 %{python2_sitelib}/omniidl_be/python.py*
 # %%{python2_sitelib}/omniidl_be is in omniORB, __init__ is an empty file
 %exclude %{python2_sitelib}/omniidl_be/__init__.py*
-
-%files -n omniORBpy-libs
 %{python2_sitearch}/*_omni*.so*
 
 %files -n omniORBpy-devel
+%license COPYING.LIB
 # %%{_includedir}/omniORB4 is in omniORB-devel
 %{_includedir}/omniORB4/*
 %{_includedir}/omniORBpy.h
 
 
 %changelog
+* Tue Jul 11 2017 Sandro Mani <manisandro@gmail.com> - 4.2.2-1
+- Update to 4.2.2
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 069fb45..02eeb48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-af92b93c55ec0308fce3f067f186c3f4  omniORBpy-4.2.1.tar.bz2
+SHA512 (omniORBpy-4.2.2.tar.bz2) = 9c7a4cbae6378f644a541ea8c62bb63b55eb33fb8b28a34a6c5758d3819a1aecc5372ae0a4386e19aa06eaf79447901d922970a2986f66de47d4c30de46e89fa