diff --git a/.gitignore b/.gitignore
index ad6d382..14e570d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 pefile-1.2.10-63.tar.gz
 /pefile-1.2.10-123.tar.gz
 /pefile-1.2.10-139.tar.gz
+/pefile-2016.3.28.tar.gz
diff --git a/python-pefile.spec b/python-pefile.spec
index 77129bc..ee8c9f1 100644
--- a/python-pefile.spec
+++ b/python-pefile.spec
@@ -1,53 +1,80 @@
-Name:           python-pefile
-# upstream version embeds a dash, we replace this with an underscore:
-Version:        1.2.10_139
-Release:        5%{?dist}
+%global srcname pefile
+
+%global common_desc pefile is a multi-platform Python module to read and work with Portable\
+Executable (aka PE) files. Most of the information in the PE Header is \
+accessible, as well as all the sections, section's information and data.\
+pefile requires some basic understanding of the layout of a PE file. Armed \
+with it it's possible to explore nearly every single feature of the file.\
+Some of the tasks that pefile makes possible are:\
+* Modifying and writing back to the PE image\
+* Header Inspection\
+* Sections analysis\
+* Retrieving data\
+* Warnings for suspicious and malformed values\
+* Packer detection with PEiD’s signatures\
+* PEiD signature generation\
+
+
+Name:           python-%{srcname}
+Version:        2016.3.28
+Release:        1%{?dist}
 Summary:        Python module for working with Portable Executable files
 License:        MIT
-URL:            http://code.google.com/p/pefile/
+URL:            https://github.com/erocarrera/pefile
 
-%global realver $(echo %{version} | tr "_" "-")
-
-Source0:        http://pefile.googlecode.com/files/pefile-%{realver}.tar.gz
+Source0:        https://github.com/erocarrera/pefile/archive/v%{version}/pefile-%{version}.tar.gz 
 BuildArch:      noarch
 BuildRequires:  python2-devel
-BuildRequires:  python-setuptools
+BuildRequires:  python2-setuptools
 
 %description
-pefile is a multi-platform Python module to read and work with Portable 
-Executable (aka PE) files. Most of the information in the PE Header is 
-accessible, as well as all the sections, section's information and data.
+%{common_desc}
 
-pefile requires some basic understanding of the layout of a PE file. Armed 
-with it it's possible to explore nearly every single feature of the file.
+%package -n python2-%{srcname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python2-%{srcname}}
 
-Some of the tasks that pefile makes possible are:
+%description -n python2-%{srcname}
+%{common_desc}
+
+%package -n python3-%{srcname}
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-%{srcname}}
+
+%description -n python3-%{srcname}
+%{common_desc}
 
-* Modifying and writing back to the PE image
-* Header Inspection
-* Sections analysis
-* Retrieving data
-* Warnings for suspicious and malformed values
-* Packer detection with PEiD’s signatures
-* PEiD signature generation
 
 %prep
-%setup -qn pefile-%{realver}
-
-# Fix end-of-line encoding of the license file:
-sed -i 's/\r//' COPYING
+%autosetup -n %{srcname}-%{version}
 
 %build
-%{__python2} setup.py build
+%py2_build
+%py3_build
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
+%py3_install
 
-%files
-%doc COPYING README
+%check
+%{__python2} setup.py test
+%{__python3} setup.py test
+
+%files -n python2-%{srcname}
+%license LICENSE
+%doc README*
 %{python2_sitelib}/*
 
+%files -n python3-%{srcname}
+%license LICENSE
+%doc README*
+%{python3_sitelib}/*
+
 %changelog
+* Tue Nov 01 2016 Athmane Madjoudj <athmane@fedoraproject.org> - 2016.3.28-1
+- Update to 2016.3.28
+- Revamp the specfile
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.10_139-5
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 
diff --git a/sources b/sources
index 97fdc48..6f098b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f10a94320bfaca356fff4d28c41e9278  pefile-1.2.10-139.tar.gz
+a7ab058f94e2499eec65c86907321039  pefile-2016.3.28.tar.gz