diff --git a/ansible-2.3.0.0.tar.gz b/ansible-2.3.0.0.tar.gz
deleted file mode 100644
index 175941f..0000000
--- a/ansible-2.3.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:299f3907cd566a20e163942fa82b6afc86ef89c2726ba503b90c1a651e82a458
-size 4251730
diff --git a/ansible-2.3.1.0.tar.gz b/ansible-2.3.1.0.tar.gz
new file mode 100644
index 0000000..e80f773
--- /dev/null
+++ b/ansible-2.3.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd4b8f53720fcd0c351156b840fdd15ecfbec22c951b5406ec503de49d40b9f5
+size 4263357
diff --git a/ansible.changes b/ansible.changes
index 964a006..c0645f6 100644
--- a/ansible.changes
+++ b/ansible.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Jun 07 20:51:30 UTC 2017 - matthias.eliasson@gmail.com
+
+- update to 2.3.1.0 (final)
+- clean up of spec file with spec-cleaner
+
+-------------------------------------------------------------------
+Wed May 10 22:35:24 UTC 2017 - lars@linux-schulserver.de
+
+- update to 2.3.1 RC1 (package version 2.3.0.1):
+  * SECURITY (MODERATE): fix for CVE-2017-7481, in which data for 
+    lookup plugins used as variables was not being correctly marked
+    as "unsafe".
+
 -------------------------------------------------------------------
 Tue Mar 28 08:30:35 UTC 2017 - michael@stroeder.com
 
diff --git a/ansible.spec b/ansible.spec
index 269986e..020f943 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -18,37 +18,40 @@
 #
 
 
+%if 0%{?suse_version} && 0%{?suse_version} <= 1110 || 0%{?rhel} == 5
+%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%else
+BuildArch:      noarch
+%endif
 Name:           ansible
-Version:        2.3.0.0
+Version:        2.3.1.0
 Release:        0
 Summary:        Radically simple IT automation
 License:        GPL-3.0
 Group:          Development/Languages/Python
 Url:            http://ansible.com/
-Source:         https://releases.ansible.com/ansible/ansible-%{version}.tar.gz 
-
+Source:         https://releases.ansible.com/ansible/ansible-%{version}.tar.gz
 Source99:       ansible-rpmlintrc
-
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version}
-%if 0%{?suse_version} >= 01130
-BuildRequires:  python-paramiko
-Requires:       python-paramiko
-BuildRequires:  python-Jinja2
-Requires:       python-Jinja2
-BuildRequires:  python-PyYAML
-Requires:       python-PyYAML
-BuildRequires:  python-pycrypto >= 2.6
-Requires:       python-pycrypto >= 2.6
-%endif
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python-setuptools
+Recommends:     python-dnspython
 Recommends:     python-dopy
 Recommends:     python-pywinrm
 Recommends:     sshpass
-Recommends:     python-dnspython
+%if 0%{?suse_version} >= 01130
+BuildRequires:  python-Jinja2
+BuildRequires:  python-PyYAML
+BuildRequires:  python-paramiko
+BuildRequires:  python-pycrypto >= 2.6
+Requires:       python-Jinja2
+Requires:       python-PyYAML
+Requires:       python-paramiko
+Requires:       python-pycrypto >= 2.6
+%endif
 %endif
-
 # RHEL == 6
 %if 0%{?rhel} == 6
 Requires:       python-crypto2.6
@@ -65,22 +68,14 @@ Requires:       python-paramiko
 Requires:       python-setuptools
 %endif
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110 || 0%{?rhel} == 5
-%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%else
-BuildArch:      noarch
-%endif
-
-%description 
+%description
 Ansible is a radically simple IT automation system.  It handles
 configuration-management, application deployment, cloud provisioning, ad-hoc
 task-execution, and multinode orchestration - including trivializing things
 like zero downtime rolling updates with load balancers.
 
 %prep
-%setup -q -n ansible-%{version}
+%setup -q -n ansible-2.3.1.0
 
 %build
 python setup.py build
@@ -88,9 +83,9 @@ python setup.py build
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-mkdir -p %{buildroot}/etc/ansible/
-cp examples/hosts %{buildroot}/etc/ansible/
-cp examples/ansible.cfg %{buildroot}/etc/ansible/
+mkdir -p %{buildroot}%{_sysconfdir}/ansible/
+cp examples/hosts %{buildroot}%{_sysconfdir}/ansible/
+cp examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/
 mkdir -p %{buildroot}/%{_mandir}/man1/
 cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/
 mkdir -p %{buildroot}/%{_datadir}/ansible