diff --git a/app-editors/nano/nano-2.4.3.recipe b/app-editors/nano/nano-2.5.0.recipe
similarity index 88%
rename from app-editors/nano/nano-2.4.3.recipe
rename to app-editors/nano/nano-2.5.0.recipe
index 40a54f4b3..0244fe1fa 100644
--- a/app-editors/nano/nano-2.4.3.recipe
+++ b/app-editors/nano/nano-2.5.0.recipe
@@ -13,8 +13,8 @@ HOMEPAGE="http://www.nano-editor.org/"
 COPYRIGHT="1999-2010 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="http://www.nano-editor.org/dist/v2.4/nano-$portVersion.tar.gz"
-CHECKSUM_SHA256="32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2"
+SOURCE_URI="http://www.nano-editor.org/dist/v2.5/nano-$portVersion.tar.gz"
+CHECKSUM_SHA256="ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee"
 PATCHES="nano-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/app-editors/nano/patches/nano-2.4.3.patchset b/app-editors/nano/patches/nano-2.5.0.patchset
similarity index 68%
rename from app-editors/nano/patches/nano-2.4.3.patchset
rename to app-editors/nano/patches/nano-2.5.0.patchset
index 02fc9362a..303661e99 100644
--- a/app-editors/nano/patches/nano-2.4.3.patchset
+++ b/app-editors/nano/patches/nano-2.5.0.patchset
@@ -1,20 +1,19 @@
-From b51cd55b9f592bbefccd43598651d3633826bc3f Mon Sep 17 00:00:00 2001
+From 400d995a9c4acb135dd6febcd9494c44969d259e Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Mon, 23 Mar 2015 17:20:54 +0000
 Subject: Haiku patch
 
 
 diff --git a/src/files.c b/src/files.c
-index 84dd62c..9092c62 100644
+index 481ffeb..3cd4af0 100644
 --- a/src/files.c
 +++ b/src/files.c
-@@ -1229,11 +1229,11 @@ void do_insertfile(
+@@ -1212,10 +1212,10 @@ void do_insertfile(
  
  #if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_HISTORIES)
  	    if (ISSET(MULTIBUFFER)) {
 +		ssize_t savedposline, savedposcol;
- 		/* Update the screen to account for the current
- 		 * buffer. */
+ 		/* Update the screen to account for the current buffer. */
  		display_buffer();
  
 -		ssize_t savedposline, savedposcol;
@@ -22,10 +21,10 @@ index 84dd62c..9092c62 100644
  #ifndef NANO_TINY
  			!execute &&
 diff --git a/src/text.c b/src/text.c
-index 9069ab5..0ae7c04 100644
+index a798521..85d7ed7 100644
 --- a/src/text.c
 +++ b/src/text.c
-@@ -398,11 +398,12 @@ void undo_cut(undo *u)
+@@ -446,11 +446,12 @@ void undo_cut(undo *u)
  /* Redo a cut, or undo an uncut. */
  void redo_cut(undo *u)
  {
@@ -36,27 +35,27 @@ index 9069ab5..0ae7c04 100644
  	return;
  
 -    filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
-     cutbuffer = NULL;
-     cutbottom = NULL;
+     cutbuffer = cutbottom = NULL;
  
-@@ -433,6 +434,7 @@ void redo_cut(undo *u)
+     goto_line_posx(u->lineno, u->begin);
+@@ -473,6 +474,7 @@ void redo_cut(undo *u)
  /* Undo the last thing(s) we did. */
  void do_undo(void)
  {
 +    filestruct *f;
      undo *u = openfile->current_undo;
-     filestruct *t = 0;
-     size_t len = 0;
-@@ -443,7 +445,7 @@ void do_undo(void)
+     filestruct *t = NULL;
+     char *data, *undidmsg = NULL;
+@@ -482,7 +484,7 @@ void do_undo(void)
  	return;
      }
  
 -    filestruct *f = fsfromline(u->mark_begin_lineno);
 +    f = fsfromline(u->mark_begin_lineno);
      if (!f) {
- 	statusbar(_("Internal error: can't match line %d.  Please save your work."), u->mark_begin_lineno);
- 	return;
-@@ -533,6 +535,7 @@ void do_undo(void)
+ 	statusbar(_("Internal error: can't match line %d.  "
+ 			"Please save your work."), u->mark_begin_lineno);
+@@ -575,6 +577,7 @@ void do_undo(void)
  	break;
      case INSERT:
  	undidmsg = _("text insert");
@@ -64,7 +63,7 @@ index 9069ab5..0ae7c04 100644
  	filestruct *oldcutbuffer = cutbuffer, *oldcutbottom = cutbottom;
  	cutbuffer = NULL;
  	cutbottom = NULL;
-@@ -551,6 +554,7 @@ void do_undo(void)
+@@ -593,6 +596,7 @@ void do_undo(void)
  	cutbuffer = oldcutbuffer;
  	cutbottom = oldcutbottom;
  	openfile->mark_set = FALSE;
@@ -72,25 +71,25 @@ index 9069ab5..0ae7c04 100644
  	break;
      case REPLACE:
  	undidmsg = _("text replace");
-@@ -577,6 +581,8 @@ void do_undo(void)
+@@ -620,6 +624,8 @@ void do_undo(void)
  /* Redo the last thing(s) we undid. */
  void do_redo(void)
  {
 +    filestruct *shoveline;
 +    filestruct *f;
-     undo *u = openfile->undotop;
-     size_t len = 0;
      char *data, *redidmsg = NULL;
-@@ -592,7 +598,7 @@ void do_redo(void)
+     undo *u = openfile->undotop;
+ 
+@@ -637,7 +643,7 @@ void do_redo(void)
  	return;
      }
  
--    filestruct *f = fsfromline(u->mark_begin_lineno);
-+    f = fsfromline(u->mark_begin_lineno);
+-    filestruct *f = fsfromline(u->type == INSERT ? 1 : u->mark_begin_lineno);
++    f = fsfromline(u->type == INSERT ? 1 : u->mark_begin_lineno);
      if (!f) {
- 	statusbar(_("Internal error: can't match line %d.  Please save your work."), u->mark_begin_lineno);
- 	return;
-@@ -628,7 +634,7 @@ void do_redo(void)
+ 	statusbar(_("Internal error: can't match line %d.  "
+ 			"Please save your work."), u->mark_begin_lineno);
+@@ -671,7 +677,7 @@ void do_redo(void)
  	break;
      case ENTER:
  	redidmsg = _("line break");
@@ -99,7 +98,7 @@ index 9069ab5..0ae7c04 100644
  	shoveline->data = mallocstrcpy(NULL, u->strdata);
  	data = mallocstrncpy(NULL, f->data, u->begin + 1);
  	data[u->begin] = '\0';
-@@ -1090,6 +1096,7 @@ fprintf(stderr, "  >> Updating... action = %d, fs->last_action = %d, openfile->c
+@@ -1128,6 +1134,7 @@ fprintf(stderr, "  >> Updating... action = %d, openfile->last_action = %d, openf
  	    free_filestruct(u->cutbuffer);
  	u->cutbuffer = copy_filestruct(cutbuffer);
  	if (u->mark_set) {
@@ -107,7 +106,7 @@ index 9069ab5..0ae7c04 100644
  	    /* If the "marking" operation was from right-->left or
  	     * bottom-->top, then swap the mark points. */
  	    if ((u->lineno == u->mark_begin_lineno && u->begin < u->mark_begin_x)
-@@ -1098,7 +1105,7 @@ fprintf(stderr, "  >> Updating... action = %d, fs->last_action = %d, openfile->c
+@@ -1136,7 +1143,7 @@ fprintf(stderr, "  >> Updating... action = %d, openfile->last_action = %d, openf
  		u->begin = u->mark_begin_x;
  		u->mark_begin_x = x_loc;
  
@@ -116,7 +115,7 @@ index 9069ab5..0ae7c04 100644
  		u->lineno = u->mark_begin_lineno;
  		u->mark_begin_lineno = line;
  	    } else
-@@ -1173,6 +1180,8 @@ bool do_wrap(filestruct *line)
+@@ -1217,6 +1224,8 @@ bool do_wrap(filestruct *line)
  	/* The next line, minus indentation. */
      size_t next_line_len = 0;
  	/* The length of next_line. */
@@ -125,7 +124,7 @@ index 9069ab5..0ae7c04 100644
  
      /* There are three steps.  First, we decide where to wrap.  Then, we
       * create the new wrap line.  Finally, we clean up. */
-@@ -1226,8 +1235,8 @@ bool do_wrap(filestruct *line)
+@@ -1264,8 +1273,8 @@ bool do_wrap(filestruct *line)
      add_undo(SPLIT_BEGIN);
  #endif