diff --git a/utils/nano/Makefile b/utils/nano/Makefile
index aaec7f65..f9f9575d 100644
--- a/utils/nano/Makefile
+++ b/utils/nano/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nano
-PKG_VERSION:=6.4
+PKG_VERSION:=7.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/nano
-PKG_HASH:=4199ae8ca78a7796de56de1a41b821dc47912c0307e9816b56cc317df34661c0
+PKG_HASH:=8dd6eac38b2b8786d82681f0e1afd84f6b75210d17391b6443c437e451552149
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING
diff --git a/utils/nano/patches/100-post-7.0-fix-commenting.patch b/utils/nano/patches/100-post-7.0-fix-commenting.patch
new file mode 100644
index 00000000..a0fb94f6
--- /dev/null
+++ b/utils/nano/patches/100-post-7.0-fix-commenting.patch
@@ -0,0 +1,18 @@
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -1395,11 +1395,14 @@ bool changes_something(const void *f)
+ #ifndef NANO_TINY
+ 			f == chop_previous_word || f == chop_next_word ||
+ 			f == zap_text || f == cut_till_eof || f == do_execute ||
+-			f == do_indent || f == do_unindent || f == do_comment ||
++			f == do_indent || f == do_unindent ||
+ #endif
+ #ifdef ENABLE_JUSTIFY
+ 			f == do_justify || f == do_full_justify ||
+ #endif
++#ifdef ENABLE_COMMENT
++			f == do_comment ||
++#endif
+ #ifdef ENABLE_SPELLER
+ 			f == do_spell ||
+ #endif