diff --git a/Mako-1.0.1.tar.gz b/Mako-1.0.1.tar.gz
deleted file mode 100644
index 67f5279..0000000
--- a/Mako-1.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:45f0869febea59dab7efd256fb451c377cbb7947bef386ff0bb44627c31a8d1c
-size 473295
diff --git a/Mako-1.0.4.tar.gz b/Mako-1.0.4.tar.gz
new file mode 100644
index 0000000..608a7b1
--- /dev/null
+++ b/Mako-1.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059
+size 574213
diff --git a/python-Mako.changes b/python-Mako.changes
index 49e88ea..9ccbff4 100644
--- a/python-Mako.changes
+++ b/python-Mako.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Fri Sep 16 04:04:40 UTC 2016 - toddrme2178@gmail.com
+
+- update to version 1.0.4:
+  * [test] [feature] The default test runner is now py.test. Running
+    “python setup.py test” will make use of py.test instead of
+    nose. nose still works as a test runner as well, however.
+  * [lexer] [bug] Major improvements to lexing of intricate Python
+    sections which may contain complex backslash sequences, as well as
+    support for the bitwise operator (e.g. pipe symbol) inside of
+    expression sections distinct from the Mako “filter” operator,
+    provided the operator is enclosed within parentheses or
+    brackets. Pull request courtesy Daniel Martin.
+  * [feature] Added new method Template.list_defs(). Pull request
+    courtesy Jonathan Vanasco.
+- update to version 1.0.3:
+  * Fixed an issue where the Babel plugin would not handle a
+    translation symbol that contained non-ascii characters. Pull
+    request courtesy Roman Imankulov.
+- Update to version 1.0.2
+  * The "universal wheel" marker is removed from setup.cfg, because
+    our setup.py currently makes use of conditional dependencies.
+    In :ticket:`249`, the discussion is ongoing on how to correct our
+    setup.cfg / setup.py fully so that we can handle the per-version
+    dependency changes while still maintaining optimal wheel settings,
+    so this issue is not yet fully resolved.
+  * Repair some calls within the ast module that no longer work on Python3.5;
+    additionally replace the use of ``inspect.getargspec()`` under
+    Python 3 (seems to be called from the TG plugin) to avoid deprecation
+    warnings.
+  * Update the Lingua translation extraction plugin to correctly
+    handle templates mixing Python control statements (such as if,
+    for and while) with template fragments. Pull request courtesy
+    Laurent Daverio.
+  * Added ``STOP_RENDERING`` keyword for returning/exiting from a
+    template early, which is a synonym for an empty string ``""``.
+    Previously, the docs suggested a bare
+    ``return``, but this could cause ``None`` to appear in the
+    rendered template result.
+- Implement update-alternatives
+  
 -------------------------------------------------------------------
 Fri Jul 24 19:45:09 UTC 2015 - seife+obs@b1-systems.com
 
diff --git a/python-Mako.spec b/python-Mako.spec
index 4359daf..9eb3c71 100644
--- a/python-Mako.spec
+++ b/python-Mako.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-Mako
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,25 +17,21 @@
 
 
 Name:           python-Mako
-Version:        1.0.1
+Version:        1.0.4
 Release:        0
 Url:            http://www.makotemplates.org/
 Summary:        A super-fast Python templating language
 License:        MIT
 Group:          Development/Languages/Python
-Source:         http://pypi.python.org/packages/source/M/Mako/Mako-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/M/Mako/Mako-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  python-MarkupSafe
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-BuildRequires:  python-argparse
-%endif
 BuildRequires:  python-devel
 BuildRequires:  python-mock
-BuildRequires:  python-nose
+BuildRequires:  python-pbr
+BuildRequires:  python-pytest
 BuildRequires:  python-setuptools
-%if 0%{?suse_version}
-Suggests:       python-Beaker >= 1.1
-%endif
+Requires:       python-Beaker >= 1.1
 Requires:       python-MarkupSafe
 Provides:       python-mako = %{version}
 Obsoletes:      python-mako < %{version}
@@ -44,6 +40,8 @@ Obsoletes:      python-mako < %{version}
 %else
 BuildArch:      noarch
 %endif
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
 
 %description
 Mako is a template library written in Python. It provides a familiar, non-XML 
@@ -64,17 +62,31 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-%if 0%{?suse_version} > 1320
-#FIXME : the tests fail for openSUSE < to Factory
+# Prepare for update-alternatives usage
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+mv %{buildroot}%{_bindir}/mako-render %{buildroot}%{_bindir}/mako-render-%{py_ver}
+ln -s -f %{_sysconfdir}/alternatives/mako-render %{buildroot}%{_bindir}/mako-render
+
+%post
+%_sbindir/update-alternatives \
+   --install %{_bindir}/mako-render mako-render %{_bindir}/mako-render-%{py_ver} 30
+
+%preun
+if [ $1 -eq 0 ] ; then
+    %_sbindir/update-alternatives --remove mako-render %{_bindir}/mako-render-%{py_ver}
+fi
+
 %check
 python setup.py test
-%endif
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE README.rst examples
+%doc CHANGES LICENSE README.rst
+%doc examples
 %{_bindir}/mako-render
+%{_bindir}/mako-render-%{py_ver}
+%ghost %{_sysconfdir}/alternatives/mako-render
 %{python_sitelib}/mako/
-%{python_sitelib}/Mako-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/Mako-%{version}-py*.egg-info
 
 %changelog