diff --git a/frink-2.2.2p4.tar.bz2 b/frink-2.2.2p4.tar.bz2
deleted file mode 100644
index f02e75f..0000000
--- a/frink-2.2.2p4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c20b1d378972022f9a8177b427cca66f393d631181fd3c9a411a92bf3ea01b5
-size 85390
diff --git a/frink.patch b/frink-2.3.1.a2.patch
similarity index 91%
rename from frink.patch
rename to frink-2.3.1.a2.patch
index 9a076b7..0a0e0a4 100644
--- a/frink.patch
+++ b/frink-2.3.1.a2.patch
@@ -24,8 +24,8 @@
  # Checks for programs.
  AC_PROG_CC
  
--CFLAGS="-ansii -g -Wall"
-+AM_CFLAGS="-ansi -g -Wall"
+-CFLAGS="-g"
++AM_CFLAGS="-g"
  
  AC_PROG_INSTALL
  AC_PROG_AWK
diff --git a/frink-2.3.1.a2.tar.gz b/frink-2.3.1.a2.tar.gz
new file mode 100644
index 0000000..3ee16db
--- /dev/null
+++ b/frink-2.3.1.a2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e25c7ebca35d7419f64c3cba52766be77954fc50cb741e39a4ef3fccccb07a9b
+size 104464
diff --git a/frink.changes b/frink.changes
index a179d02..bfbec83 100644
--- a/frink.changes
+++ b/frink.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Jan 13 15:20:38 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 2.3.1.a2
+  + -O option should now work
+  + Added -L option which controls switch case body indenting
+   - which causes a proc paramter definition {a b} to become { a b }
+   - which causes wrapped comments to start a new comment rather than
+     use \
+   - which cause comments not to wrap at all
+- Cleanup spec file
+- Adapt frink.patch to upstream changes > frink-2.3.1a2.patch
+- Remove redundant %clean section
+- Package ChangeLog, COPYING and TODO into doc directory
+- COPYRIGHT is not provided anymore
+
 -------------------------------------------------------------------
 Fri Dec  2 15:45:39 UTC 2011 - coolo@suse.com
 
diff --git a/frink.spec b/frink.spec
index e59357c..650ae67 100644
--- a/frink.spec
+++ b/frink.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package frink
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products 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,14 +17,14 @@
 
 Name:           frink
 Url:            http://catless.ncl.ac.uk/Programs/Frink
-Version:        2.2.2
+Version:        2.3.1.a2
 Release:        0
 Summary:        Static Testing and Formatting for Tcl Programs
 BuildRequires:  automake
 Group:          Development/Languages/Tcl
 License:        BSD-3-Clause
-Source0:        %name-%{version}p4.tar.bz2
-Patch0:         %name.patch
+Source0:        ftp://catless.ncl.ac.uk/pub/%name-%version.tar.gz
+Patch0:         %name-%{version}.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -35,14 +35,8 @@ do some rewriting.
 See /usr/share/doc/packages/frink/README and the output of "frink -h"
 for details.
 
-
-
-Authors:
---------
-    Lindsay Marshall <lindsay.marshall@newcastle.ac.uk>
-
 %prep
-%setup -q
+%setup -q -n %{name}-2.3.1
 %patch0
 
 %build
@@ -51,15 +45,11 @@ autoreconf -i --force
 make
 
 %install
-rm -rf %buildroot
 make DESTDIR="%buildroot" install
 
-%clean
-rm -rf %buildroot
-
 %files
 %defattr(-,root,root)
 %_prefix/bin/frink
-%doc AUTHORS README COPYRIGHT
+%doc AUTHORS ChangeLog COPYING README TODO
 
 %changelog