diff --git a/editors/nano/Makefile b/editors/nano/Makefile
index a23e71571bf..f7aee1cc56f 100644
--- a/editors/nano/Makefile
+++ b/editors/nano/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.54 2007/09/16 00:44:00 merdely Exp $
+# $OpenBSD: Makefile,v 1.55 2007/12/27 20:53:18 naddy Exp $
 
 COMMENT=	Pico editor clone with enhancements
 
-DISTNAME=	nano-2.0.6
+DISTNAME=	nano-2.0.7
 CATEGORIES=	editors
 HOMEPAGE=	http://www.nano-editor.org/
 
@@ -11,7 +11,7 @@ MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 MASTER_SITES=	http://www.nano-editor.org/dist/v2.0/ \
 		http://www.ewtoo.org/~astyanax/nano/dist/v2.0/
 
-# GPL
+# GPLv3
 PERMIT_PACKAGE_CDROM=	Yes 
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM=	Yes 
diff --git a/editors/nano/distinfo b/editors/nano/distinfo
index 74dcf72dfd9..9303854cc98 100644
--- a/editors/nano/distinfo
+++ b/editors/nano/distinfo
@@ -1,5 +1,5 @@
-MD5 (nano-2.0.6.tar.gz) = YZEH8Pw8Q4PWaM7xWqPKMg==
-RMD160 (nano-2.0.6.tar.gz) = hY3Hz3E3zCsZ6QhKUD/lCO9zQ4E=
-SHA1 (nano-2.0.6.tar.gz) = ABAlgEBM2xyFlOX2GTAA1aysIkk=
-SHA256 (nano-2.0.6.tar.gz) = DRDY9wpvrfuc+qe2bF/n66F+ZOy5YQTE3e3IL4l2XVw=
-SIZE (nano-2.0.6.tar.gz) = 1315207
+MD5 (nano-2.0.7.tar.gz) = Fhh/7Sve/sYnXs5kAc5M0g==
+RMD160 (nano-2.0.7.tar.gz) = lv9aiCiEUe0k9nnYjVmnUmFs6Uw=
+SHA1 (nano-2.0.7.tar.gz) = ZhbGSW5vIeYd9ruZHAvoTtpcagw=
+SHA256 (nano-2.0.7.tar.gz) = XceDxBLE0f9GPEUNKi+eHqU6Q9m6HdqSu/UYL2DbUy8=
+SIZE (nano-2.0.7.tar.gz) = 1363684
diff --git a/editors/nano/patches/patch-doc_man_nano_1 b/editors/nano/patches/patch-doc_man_nano_1
index c6cfd132ab7..056d97766a0 100644
--- a/editors/nano/patches/patch-doc_man_nano_1
+++ b/editors/nano/patches/patch-doc_man_nano_1
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_man_nano_1,v 1.1 2006/12/14 21:26:53 naddy Exp $
---- doc/man/nano.1.orig	Thu Dec  7 19:50:00 2006
-+++ doc/man/nano.1	Thu Dec  7 19:50:46 2006
-@@ -224,8 +224,6 @@ http://www.nano-editor.org/
+$OpenBSD: patch-doc_man_nano_1,v 1.2 2007/12/27 20:53:18 naddy Exp $
+--- doc/man/nano.1.orig	Thu Oct 11 07:01:29 2007
++++ doc/man/nano.1	Thu Dec 27 21:47:21 2007
+@@ -236,8 +236,6 @@ http://www.nano-editor.org/
  .PD 0
  .TP
  \fBnanorc\fP(5)
diff --git a/editors/nano/patches/patch-doc_man_nanorc_5 b/editors/nano/patches/patch-doc_man_nanorc_5
index 950717f47f4..dae73d9d366 100644
--- a/editors/nano/patches/patch-doc_man_nanorc_5
+++ b/editors/nano/patches/patch-doc_man_nanorc_5
@@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_man_nanorc_5,v 1.1 2006/12/14 21:26:53 naddy Exp $
---- doc/man/nanorc.5.orig	Sat Oct 28 21:21:12 2006
-+++ doc/man/nanorc.5	Thu Dec  7 19:54:23 2006
-@@ -250,8 +250,7 @@ Per-user configuration file
+$OpenBSD: patch-doc_man_nanorc_5,v 1.2 2007/12/27 20:53:18 naddy Exp $
+--- doc/man/nanorc.5.orig	Thu Oct 11 07:01:29 2007
++++ doc/man/nanorc.5	Thu Dec 27 21:47:21 2007
+@@ -262,8 +262,7 @@ Per-user configuration file
  .TP
  \fBnano\fP(1)
  .PP
diff --git a/editors/nano/pkg/PLIST b/editors/nano/pkg/PLIST
index fb4bec859bc..4772b58686e 100644
--- a/editors/nano/pkg/PLIST
+++ b/editors/nano/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2006/12/14 21:26:53 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.19 2007/12/27 20:53:18 naddy Exp $
 @pkgpath editors/nano,slang
 bin/nano
 bin/rnano
@@ -48,6 +48,7 @@ share/locale/sv/LC_MESSAGES/nano.mo
 share/locale/tr/LC_MESSAGES/nano.mo
 share/locale/uk/LC_MESSAGES/nano.mo
 share/locale/vi/LC_MESSAGES/nano.mo
+share/locale/zh_CN/LC_MESSAGES/nano.mo
 share/locale/zh_TW/LC_MESSAGES/nano.mo
 share/nano/
 share/nano/asm.nanorc