BSDmakefile                    | 11 +++++++++++
 GNUmakefile                    | 11 +++++++++++
 VERSION                        |  2 +-
 common.mk                      |  3 ---
 doc/cmds.texi                  |  2 +-
 doc/download.texi              |  4 ++++
 doc/install.texi               |  2 +-
 doc/integration.texi           |  6 +++---
 doc/news.ru.texi               |  7 +++++++
 doc/news.texi                  |  7 +++++++
 ports/nncp/Makefile            |  6 ++++--
 src/cypherpunks.ru/nncp/ctx.go |  2 +-

diff --git a/BSDmakefile b/BSDmakefile
index c9cd663e8c3f32f851b25f1b5d9df2abd244b965e99d83b74d4c6129b5728d16..e87d5c29572dbd6d15410d4f0b3436528b3df2133992fb2b7726f77afac13d28 100644
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -1,3 +1,14 @@
 VERSION != cat VERSION
+GO ?= go
+
+GO_MOD_EXISTS != $(GO) help mod >/dev/null 2>&1 || echo no
+
+.if ${GO_MOD_EXISTS} == "no"
+BUILDMOD ?=
+GOPATH ?= $(PWD)
+.else
+BUILDMOD ?= -mod=vendor
+GOPATH ?= $(PWD)/gopath
+.endif
 
 include common.mk
diff --git a/GNUmakefile b/GNUmakefile
index 4c73fbf6b76de756957722c0bd77ccd3c74a681ea13fe3c081491614d169bcbb..7bb48ffb78ea2392e440b6f7077ca04027d0196d36ebaa0217661e94dd74ed3d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,3 +1,14 @@
 VERSION = $(shell cat VERSION)
+GO ?= go
+
+GO_MOD_EXISTS = $(shell $(GO) help mod >/dev/null 2>&1 || echo no)
+
+ifeq ($(GO_MOD_EXISTS), no)
+BUILDMOD ?=
+GOPATH ?= $(PWD)
+else
+BUILDMOD ?= -mod=vendor
+GOPATH ?= $(PWD)/gopath
+endif
 
 include common.mk
diff --git a/VERSION b/VERSION
index dddd2b6fe8e64351ebd48d13898cd77b3dd21803c72f8a028b265ed6c316055f..1895f81d1738a241e12e69233c2d67e0f2283cc2a6c9b2db4f148658fcdf4d58 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0
+4.1
diff --git a/common.mk b/common.mk
index 32bcbe138dc2fd48c2400a24d01ff3ee6be4ed2d21ce70e68626cc87036c8782..011505435587fe4b3412b8ea4a6ec21cd7b014a971714e0459813710066b19e9 100644
--- a/common.mk
+++ b/common.mk
@@ -1,5 +1,4 @@
 PREFIX ?= /usr/local
-GO ?= go
 
 SENDMAIL ?= /usr/sbin/sendmail
 CFGPATH ?= $(PREFIX)/etc/nncp.yaml
@@ -16,7 +15,6 @@ 	-X cypherpunks.ru/nncp.DefaultCfgPath=$(CFGPATH) \
 	-X cypherpunks.ru/nncp.DefaultSendmailPath=$(SENDMAIL) \
 	-X cypherpunks.ru/nncp.DefaultSpoolPath=$(SPOOLPATH) \
 	-X cypherpunks.ru/nncp.DefaultLogPath=$(LOGPATH)
-BUILDMOD ?= -mod=vendor
 
 ALL = \
 	nncp-bundle \
@@ -40,7 +38,6 @@ 	nncp-xfer
 
 SRC := $(PWD)/src/cypherpunks.ru/nncp
 BIN := $(PWD)/bin
-GOPATH ?= $(PWD)/gopath
 
 all: $(ALL)
 
diff --git a/doc/cmds.texi b/doc/cmds.texi
index a60938daf1dbb12342ebe18ffdd108f2160cd58d62440c23b8e6b59817a3f17a..c6711915ea9d40cac58ee6fc3a90b409ae6cff1e178f7bcc277eb33fffc23a92 100644
--- a/doc/cmds.texi
+++ b/doc/cmds.texi
@@ -275,7 +275,7 @@   appender: ["/bin/sh", "-c", "cat >> /append"]
 @end verbatim
 
 then executing @verb{|echo My message | nncp-exec -replynice 123 REMOTE
-sendmail root@localhost|} will lead to executing of:
+sendmail root@localhost|} will lead to execution of:
 
 @verbatim
 echo My message |
diff --git a/doc/download.texi b/doc/download.texi
index 715c00e7dca689ef8e9377c31d8668dddf5839145882d5b47c0201a6eee3b079..1b06df5ddc1b4aeff180996bf88c52608c647a09422e9aa74d4ecdac12c00bfa 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -23,6 +23,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 4.0, 4.0} @tab 2019-04-28 @tab 1227 KiB
+@tab @url{download/nncp-4.0.tar.xz, link} @url{download/nncp-4.0.tar.xz.sig, sign}
+@tab @code{EAFA6272 22E355FC EB772A90 FC6DEA8E AE1F1695 3F48A4A3 57ADA0B4 FF918452}
+
 @item @ref{Release 3.4, 3.4} @tab 2018-06-10 @tab 1154 KiB
 @tab @url{download/nncp-3.4.tar.xz, link} @url{download/nncp-3.4.tar.xz.sig, sign}
 @tab @code{9796C4CB 7B670FC7 5FEED3CD 467CA556 B230387D 935B09BB 4B19FD57 FD17FFBA}
diff --git a/doc/install.texi b/doc/install.texi
index d54155b6084794317dd5cbdbd64f976a870ae9f18fd5090a01c1d85132b95c7b..aeb765a50281c658922bded535b2edafc5bf284ac5240c82a33b6c7f1d7de1dd 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -11,7 +11,7 @@
 NNCP should run on any POSIX-compatible operating system.
 
 NNCP is written on @url{https://golang.org/, Go} programming language
-and you have to install Go compiler (1.7+ version is highly
+and you have to install Go compiler (1.10+ version is highly
 recommended). @emph{Make} (BSD and GNU ones are fine) is recommended for
 convenient building. @url{https://www.gnu.org/software/texinfo/,
 Texinfo} is used for building documentation.
diff --git a/doc/integration.texi b/doc/integration.texi
index 7d9ec9d660231a1639135aad7973ef2ecb8d8f3a06f45ec71dad8c148a856b5a..75813015d1e578fe8859a7e768767ae175807cd53c8909e6661f06d5e818ac61 100644
--- a/doc/integration.texi
+++ b/doc/integration.texi
@@ -121,9 +121,9 @@ @end verbatim
 
 This runs the @command{nncp-exec} command to place outgoing mail into
 the NNCP queue. It substitutes the hostname (@emph{nncp-gateway}, or
-whatever you specified) and the recipients before executing the command.
-The @command{nncp-exec} command is executed without assistance from the
-shell, so there are no problems with shell meta characters.
+whatever you specified) and the recipients before execution of the
+command. The @command{nncp-exec} command is executed without assistance
+from the shell, so there are no problems with shell meta characters.
 
 @item Execute the command @command{postfix reload} to make the changes
 effective.
diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 61e6fa17a6970c7e0a72181c567c1601eea00d0865483375bf5a3a2cb3f28119..9ff685aa41a04812b5b11c304f68dcef44d9a50d16dc4d28be786be6255bddc5 100644
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 4.1
+@subsection Релиз 4.1
+@itemize
+@item
+Восстановлена работоспособность на GNU/Linux системах и Go версии 1.10.
+@end itemize
+
 @node Релиз 4.0
 @subsection Релиз 4.0
 @itemize
diff --git a/doc/news.texi b/doc/news.texi
index 0088aa0e00a8b1550849d880c9434b1a24d7ceb4a9917943730050dae96c6c1c..f873e3241a7dcdfbb4c6db9e05dd53d29e7392a2f4e2112b78559838925d0a9d 100644
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@ @unnumbered News
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 4.1
+@section Release 4.1
+@itemize
+@item
+Workability on GNU/Linux systems and Go 1.10 is fixed.
+@end itemize
+
 @node Release 4.0
 @section Release 4.0
 @itemize
diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 1ccd127ba7ca326516e75a27f7d69814ec4f75718eff3c97ce6adab9b33b0578..56d302c1b7109853748af7fab505cbda44a4dccbe04d38ea4ebbd79175223dcc 100644
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,8 @@
-# $FreeBSD: head/net/nncp/Makefile 471003 2018-05-27 20:24:00Z krion $
+# $FreeBSD: head/net/nncp/Makefile 484628 2018-11-10 18:12:57Z bapt $
 
 PORTNAME=	nncp
-DISTVERSION=	3.4
+DISTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.nncpgo.org/download/
 
@@ -24,6 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	AUTHORS NEWS NEWS.RU README README.RU THANKS
 INFO=		nncp
+MAKE_ARGS=	INFODIR=${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/nncp.newsyslog.conf.sample ${STAGEDIR}${PREFIX}/etc/nncp.conf.sample
diff --git a/src/cypherpunks.ru/nncp/ctx.go b/src/cypherpunks.ru/nncp/ctx.go
index 0c292545c690e9e6f1d7afdd808990fd62808e4ae23db5b3eba2a1090e32ddbc..66f3b4686b59cacc2c498acb648b1ee61f3b4c9a7240d7d3b4eda9080499cf92 100644
--- a/src/cypherpunks.ru/nncp/ctx.go
+++ b/src/cypherpunks.ru/nncp/ctx.go
@@ -112,5 +112,5 @@ 	var s unix.Statfs_t
 	if err := unix.Statfs(ctx.Spool, &s); err != nil {
 		log.Fatalln(err)
 	}
-	return s.Bavail*int64(s.Bsize) > want
+	return int64(s.Bavail)*int64(s.Bsize) > want
 }