VERSION             | 2 +-
 doc/Makefile        | 4 ++--
 doc/download.texi   | 4 ++++
 doc/index.texi      | 2 --
 doc/install.texi    | 2 ++
 doc/news.ru.texi    | 9 +++++++++
 doc/news.texi       | 9 +++++++++
 ports/nncp/Makefile | 2 +-
 src/sp.go           | 3 +++

diff --git a/VERSION b/VERSION
index 7ce8e3f89092f52ed660586747098cd88e6fcd428f21e17d94ac983ae93279de..37b0dd9aefbd4bc9b14859d81973f63606c1e800414d38fbe125b6fdfd4810b4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.2.0
+5.2.1
diff --git a/doc/Makefile b/doc/Makefile
index aa1183c1ac73a99177a6159118d5e6a75cc63e8d72ebfce83e9e4f976f56d4cf..25c71cb07155bf1a5b1d3b2a4805c312f2800649ce2cf3d00666b2adda876eeb 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,6 +1,6 @@
-all: nncp.info nncp.html
-
 MAKEINFO ?= makeinfo
+
+all: nncp.info nncp.html
 
 sp.utxt: sp.txt
 	plantuml -tutxt sp.txt
diff --git a/doc/download.texi b/doc/download.texi
index ba484b574fe64d5f5536fbe192cea0c4d539fede8c6f9eccf594158b896f0623..3d5011dec492175d775a10a4c95b6b40000ccb49df8dbcaa13f9e0f207b39d2c 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -24,6 +24,10 @@
 @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 5.2.0, 5.2.0} @tab 2019-12-14 @tab 1109 KiB
+@tab @url{download/nncp-5.2.0.tar.xz, link} @url{download/nncp-5.2.0.tar.xz.sig, sign}
+@tab @code{FFC55467 8B4ECCA6 92D90F42 ACC0286D 209E054E EA1CBF87 0307003E CF219610}
+
 @item @ref{Release 5.1.2, 5.1.2} @tab 2019-12-13 @tab 1106 KiB
 @tab @url{download/nncp-5.1.2.tar.xz, link} @url{download/nncp-5.1.2.tar.xz.sig, sign}
 @tab @code{52B2043B 1B22D20F C44698EC AFE5FF46 F99B4DD5 2C392D4D 25FE1580 993263B3}
diff --git a/doc/index.texi b/doc/index.texi
index 01adc44c0fcd94a8be8382020fb55f04c04486df66be6cfbb1b75d6a4d5ec8b0..32ce8a71a230eaf4fce048c86449335e2fb34019c859c8c016b09c41f23c5905 100644
--- a/doc/index.texi
+++ b/doc/index.texi
@@ -2,8 +2,6 @@ \input texinfo
 @documentencoding UTF-8
 @settitle NNCP
 
-@set VERSION 5.2.0
-
 @copying
 This manual is for NNCP (Node to Node copy) --  collection of utilities
 simplifying secure store-and-forward files and mail exchanging.
diff --git a/doc/install.texi b/doc/install.texi
index 7cdea36dd046419eb437c135260df69928f5cef0237cc09038c9da24bbf72b33..1e6affb9dee608c89602b2c2578cf803dc02c0f57b51597aa4d07fa11a7bbc8a 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -1,6 +1,8 @@
 @node Installation
 @unnumbered Installation
 
+@set VERSION 5.2.1
+
 Possibly NNCP package already exists for your distribution:
 
 @itemize
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index d79075844a69ddea04a9a2265b0fe09fb1d73b6d5e2bcff95b1661203bbecd63..e1f016bdbdd2526fcbcdc4873503dd0904721904639adfd07856f6bb13d49ae3 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.2.1
+@subsection Релиз 5.2.1
+@itemize
+
+@item
+Исправлена обработка ошибки SP протокола, иногда вызывающая панику программы.
+
+@end itemize
+
 @node Релиз 5.2.0
 @subsection Релиз 5.2.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 57f8311a4e2afd10d1a73e8df024fb71b415f6d4aa9cf4e4f856ad084ba9490b..268e21054811a38f0d1cb177cfc50c6dfb88d3557b347febeacd6d5874cd9912 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@ @unnumbered News
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.2.1
+@section Release 5.2.1
+@itemize
+
+@item
+Fixed SP protocol error handling, sometimes causing program panic.
+
+@end itemize
+
 @node Release 5.2.0
 @section Release 5.2.0
 @itemize
diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index dc7db38fad46940aaa536c3412e01e4c510c487576d13bd3265b3432b86ca19f..62083aadeca2b150a3c05ccf459ce336f5831760c8fbe4998ce8ec44c52ffe2c 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: head/net/nncp/Makefile 517819 2019-11-17 11:51:56Z dmgk $
 
 PORTNAME=	nncp
-DISTVERSION=	5.2.0
+DISTVERSION=	5.2.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
diff --git a/src/sp.go b/src/sp.go
index 8275f553ab78899c63373389a5ee7b31c851cb49bde89c66593a667671b39f7b..d29b4b6f555e5536ba64a07a7a642b7068639c1c524ce98662dca9ef03713ea5 100644
--- a/src/sp.go
+++ b/src/sp.go
@@ -680,6 +680,9 @@ 			state.Ctx.LogD("sp-recv", sds, "waiting for payload")
 			conn.SetReadDeadline(time.Now().Add(DefaultDeadline * time.Second))
 			payload, err := state.ReadSP(conn)
 			if err != nil {
+				if err == io.EOF {
+					break
+				}
 				unmarshalErr := err.(*xdr.UnmarshalError)
 				netErr, ok := unmarshalErr.Err.(net.Error)
 				if ok && netErr.Timeout() {