diff --git a/nano-2.3.0.tar.bz2 b/nano-2.3.0.tar.bz2
deleted file mode 100644
index 5504020..0000000
--- a/nano-2.3.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b78cac6778d7bb095a86667c567329c25ef9172c21275d90a661f1d62d900e69
-size 1069399
diff --git a/nano-2.3.1.tar.bz2 b/nano-2.3.1.tar.bz2
new file mode 100644
index 0000000..578d178
--- /dev/null
+++ b/nano-2.3.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a93f1e15a0efc1d1a51501d693b0e28ab1482362c80d47c9f96dfaec5d482b8a
+size 1095536
diff --git a/nano-no-build-date.patch b/nano-no-build-date.patch
deleted file mode 100644
index 61219a7..0000000
--- a/nano-no-build-date.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/nano.c
-===================================================================
---- src/nano.c.orig	2010-04-14 01:07:06.000000000 -0400
-+++ src/nano.c	2010-08-30 23:06:00.830692326 -0400
-@@ -935,8 +935,7 @@ void usage(void)
-  * it was compiled with. */
- void version(void)
- {
--    printf(_(" GNU nano version %s (compiled %s, %s)\n"), VERSION,
--	__TIME__, __DATE__);
-+    printf(_(" GNU nano version %s\n"), VERSION);
-     printf(" (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,\n");
-     printf(" 2008, 2009 Free Software Foundation, Inc.\n");
-     printf(
diff --git a/nano.changes b/nano.changes
index b362453..e054ebc 100644
--- a/nano.changes
+++ b/nano.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed May 11 17:21:21 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to version 2.3.1:
+  * Some fixes for the new libmagic code.
+  * Fix for improper character counts when using auto-indent.
+  * New syntax highlighting definitions for RPM spec and lua files.
+- Spec file updates:
+  * Simplified License: to GPLv3+ which is the main license.
+- Removed nano-no-build-date.patch and added a fix inside the spec file.
+
 -------------------------------------------------------------------
 Sun Feb 27 13:37:00 UTC 2011 - asterios.dramis@gmail.com
 
diff --git a/nano.spec b/nano.spec
index 3a4ebea..0babb03 100644
--- a/nano.spec
+++ b/nano.spec
@@ -19,17 +19,15 @@
 
 
 Name:           nano
-Version:        2.3.0
+Version:        2.3.1
 Release:        1
 Summary:        Pico Editor Clone with Enhancements
 
-License:        GPLv3+ and (GFDL or GPLv3+)
+License:        GPLv3+
 Url:            http://www.nano-editor.org/
 Group:          Productivity/Editors/Other
 # http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
 Source0:        %{name}-%{version}.tar.bz2
-# PATCH-FIX-OPENSUSE no-build-date.patch cristian.rodriguez@opensuse.org -- Do not provide build dates in binaries
-Patch0:         nano-no-build-date.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  file-devel
@@ -42,24 +40,15 @@ Recommends:     %{name}-lang = %{version}
 GNU nano is a small and friendly text editor. It aims to emulate the
 Pico text editor while also offering a few enhancements.
 
-
-
-Authors:
---------
-    Chris Allegretta <chrisa@asty.org>
-    David Lawrence Ramsey <pooka109@gmail.com> 
-    Jordi Mallach <jordi@gnu.org>
-    Adam Rogoyski <rogoyski@cs.utexas.edu>
-    Robert Siemborski <rjs3@andrew.cmu.edu>
-    Rocco Corsi <rocco.corsi@sympatico.ca>
-    David Benbennick <dbenbenn@math.cornell.edu>
-    Mike Frysinger <vapier@gentoo.org>
-
-
 %lang_package
 %prep
 %setup -q
-%patch0
+
+# Remove build time references so build-compare can do its work
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/nano.c
+sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/nano.c
 
 %build
 %configure --disable-rpath --enable-utf8