diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74ca3d7..d5ee90e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,16 +3,18 @@
 ## Version 2.0.3
 
 ### modulecmd
-* Misleading error message fix if system configuration file is not
-  readable.
+* Misleading error message fixed if system configuration file is not readable.
   (#1316)
 
 ### build system
-* set CC and CXX if not defined. This was a bug introduced in 2.0.2
-  (#1322)
+* pbuild::install_docfiles() is now obsolete. If called it exists with
+  an error message.
+  (#1327)
 * default values for `PMODULES_TMPDIR` and `PMODULES_DISTFILESDIR` are now 
   more general.
   (#1325)
+* set CC and CXX if not defined. This was a bug introduced in 2.0.2
+  (#1322)
 
 ### building Pmodules
 * path to Lua installation fixed in recipe to build luarocks
diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index 1d7667b..2f2ceb4 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -672,7 +672,7 @@ pbuild::compile() {
 #   $@: documentation files relative to source
 #
 pbuild::install_docfiles() {
-	std::info \
+	std::die \
 		"Using ${FUNCNAME[0]} is deprecated with YAML module configuration files."
 	MODULE_DOCFILES+=("$@")
 }
diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index 18efd61..8fc94ac 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -136,7 +136,7 @@ save_env() {
 		via a trap handler.'
 	encode_base64(){
 		local -- os_name=''
-		os_name=$(${uname} -s)
+		os_name=$(uname -s)
 
 		case "${os_name}" in
 			Linux )