diff --git a/nano-2.3.2.tar.gz b/nano-2.3.2.tar.gz
deleted file mode 100644
index f5e9a33..0000000
--- a/nano-2.3.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff309248071486445609ad4269b798262a1324d7503dc09dea289f5b60106be8
-size 1725485
diff --git a/nano-2.3.6.tar.gz b/nano-2.3.6.tar.gz
new file mode 100644
index 0000000..13a8f5a
--- /dev/null
+++ b/nano-2.3.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534
+size 1816012
diff --git a/nano.changes b/nano.changes
index b4d7acd..9ebadd3 100644
--- a/nano.changes
+++ b/nano.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Sep 16 18:24:20 UTC 2014 - asterios.dramis@gmail.com
+
+- Update to version 2.3.6:
+  * Fix for installing internationalization files.
+  * Documentation (in particular man page) fixes.
+  * Few touch ups to syntax highlighting definitions.
+  From version 2.3.5:
+  * Many visible and under-the-hood fixes for components such as file locking,
+    more fixes to the undo system, and you no longer have to explicitly ask
+    nano to have undo/redo support as it now defaults to being enabled.
+  * Better handling of --tempfile mode.
+  * Better handling of command line arguments when also attempting to specify
+    +<line number>.
+  From version 2.3.4:
+  * Small number of fixes, but in particular allows nano to compile on non-UTF8
+    curses implementations (i.e. libncursesw).
+  * Small fixes to the undo implementation.
+  * Small fixes to the default syntax config.
+  From version 2.3.3:
+  * Many improvements to the core system, including substantial improvements to
+    the undo/redo code, UTF-8 handling, the configure script, and display of
+    shortcuts on very wide terminals.
+  * Ability to read named pipes (--noread), as well as linter support (see the
+    nanorc man page for details).
+  * Much improved syntax highlighting code, and configurations for JSON,
+    texinfo, Go, and a default syntax for catch all highlighting.
+  * Ability to set the color of the title bar, status bar, and shortcut keys
+    (e.g. "^X") and their descriptions (see the nanorc man page for details).
+  * Lots of other fixes.
+- Added new build requirements groff-full, makeinfo and pkg-config.
+
 -------------------------------------------------------------------
 Sat Mar 23 23:05:28 UTC 2013 - asterios.dramis@gmail.com
 
diff --git a/nano.spec b/nano.spec
index 4a76c89..98fcbd3 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package nano
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,7 +17,7 @@
 
 
 Name:           nano
-Version:        2.3.2
+Version:        2.3.6
 Release:        0
 Summary:        Pico Editor Clone with Enhancements
 License:        GPL-3.0+
@@ -25,7 +25,18 @@ Group:          Productivity/Editors/Other
 Url:            http://www.nano-editor.org/
 Source0:        http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
 BuildRequires:  file-devel
+%if 0%{?suse_version} > 1230
+BuildRequires:  groff-full
+%else
+BuildRequires:  groff
+%endif
+%if 0%{?suse_version} > 1140
+BuildRequires:  makeinfo
+%else
+BuildRequires:  texinfo
+%endif
 BuildRequires:  ncurses-devel
+BuildRequires:  pkg-config
 Requires(post): info
 Requires(preun): info
 Recommends:     %{name}-lang = %{version}
@@ -53,12 +64,13 @@ make %{?_smp_mflags}
 %install
 %makeinstall
 
-# Remove doc files from /usr/share/nano (they should be in defaultdocdir)
+# Remove doc files that should be in defaultdocdir
 rm -rf %{buildroot}%{_datadir}/nano/man-html/
+rm -rf %{buildroot}%{_datadir}/doc/nano/
 
 # Manually install the doc files in order to easily split them between the main and lang package
 install -dpm 0755 %{buildroot}%{_defaultdocdir}/nano
-install -pm 0644 AUTHORS BUGS COPYING COPYING.DOC ChangeLog ChangeLog.pre-2.1 NEWS README THANKS TODO UPGRADE %{buildroot}%{_defaultdocdir}/nano/
+install -pm 0644 AUTHORS COPYING COPYING.DOC ChangeLog ChangeLog.pre-2.1 NEWS README THANKS TODO UPGRADE %{buildroot}%{_defaultdocdir}/nano/
 install -pm 0644 doc/faq.html doc/nanorc.sample %{buildroot}%{_defaultdocdir}/nano/
 install -dpm 0755 %{buildroot}%{_defaultdocdir}/nano/man-html/fr
 install -pm 0644 doc/man/*.html %{buildroot}%{_defaultdocdir}/nano/man-html/