diff --git a/mechanize-0.2.5.tar.gz b/mechanize-0.2.5.tar.gz
deleted file mode 100644
index 0b10746..0000000
--- a/mechanize-0.2.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e67b20d107b30c00ad814891a095048c35d9d8cb9541801cebe85684cc84766
-size 383918
diff --git a/mechanize-0.3.6.tar.gz b/mechanize-0.3.6.tar.gz
new file mode 100644
index 0000000..3acf78e
--- /dev/null
+++ b/mechanize-0.3.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:654e705157156c1f316601ea4f7ab27e96713a8a4dabe1604e6cc8d48e0aa1e8
+size 201845
diff --git a/python-mechanize.changes b/python-mechanize.changes
index 51f02ed..ba827ec 100644
--- a/python-mechanize.changes
+++ b/python-mechanize.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Aug  6 20:28:11 UTC 2018 - toddrme2178@gmail.com
+
+- Remove unneeded dependencies.
+
+-------------------------------------------------------------------
+Thu Jun 14 17:21:43 UTC 2018 - mcepl@suse.com
+
+- Clean SPEC file (only py2k, but tests are enabled and run)
+
+-------------------------------------------------------------------
+Thu Aug 24 13:45:20 UTC 2017 - jmatejek@suse.com
+
+- singlespec auto-conversion
+
 -------------------------------------------------------------------
 Sat Nov  9 10:59:58 UTC 2013 - p.drouand@gmail.com
 
@@ -124,3 +139,4 @@ Wed Aug 30 00:00:00 UTC 2006 - jfunk@funktronics.ca
 
 - Initial release
 
+
diff --git a/python-mechanize.spec b/python-mechanize.spec
index eb8edfb..95e8148 100644
--- a/python-mechanize.spec
+++ b/python-mechanize.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-mechanize
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,24 @@
 #
 
 
-Name:           python-mechanize
-Version:        0.2.5
+%define skip_python3 1
+%define modname mechanize
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+
+Name:           python-%{modname}
+Version:        0.3.6
 Release:        0
-Url:            http://wwwsearch.sourceforge.net/mechanize/
 Summary:        Stateful programmatic web browsing
-License:        (BSD-3-Clause or ZPL-2.1) and BSD-3-Clause
+License:        (BSD-3-Clause OR ZPL-2.1) AND BSD-3-Clause
 Group:          Development/Languages/Python
-Source:         mechanize-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel
-BuildRequires:  python-setuptools
-Requires:       python-ClientForm
-Requires:       python-beautifulsoup
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
+URL:            https://github.com/python-mechanize/mechanize
+Source:         https://pypi.python.org/packages/source/m/%{modname}/%{modname}-%{version}.tar.gz
+BuildRequires:  %{python_module html5lib}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildArch:      noarch
-%endif
+%python_subpackages
 
 %description
 Stateful programmatic web browsing, after Andy Lester's Perl module
@@ -53,18 +53,23 @@ Johnny Lee (MSIE Cookie support) and last but not least Andy Lester
 (WWW::Mechanize). urllib2 was written by Jeremy Hylton.
 
 %prep
-%setup -q -n mechanize-%{version}
-sed -i "1d" examples/{forms/echo.cgi,forms/example.py,forms/simple.py} # Fix doc-file-dependency
+%setup -q -n %{modname}-%{version}
+sed -i -e '/^#!\/usr\/bin\/env python/d' %{modname}/_{entities,equiv,form_controls}.py
+sed -i "1d" examples/forms/{echo.cgi,example.py,simple.py} # Fix doc-file-dependency
 
 %build
-python setup.py build
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%files
-%defattr(-,root,root)
-%doc examples COPYING.txt README.txt docs/html/ChangeLog.txt
-%{python_sitelib}/*
+%check
+%python_expand $python ./run_tests.py
+
+%files %{python_files}
+%license LICENSE
+%doc examples README.rst
+%{python_sitelib}/%{modname}*
 
 %changelog