diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60938983..5f21ad6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,8 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * evolinux-base: fix alert5.service dependency syntax
 * mysql : Create a default ~root/.my.cnf for compatibility reasons
 * nginx : fix variable name and debug to actually use nginx-light
-* packweb-apache : Support php 8.0 
+* packweb-apache : Support php 8.0
+* nagios-nrpe: Fix check\_nfsserver for buster and bullseye
 
 ### Removed
 
diff --git a/nagios-nrpe/files/plugins/check_nfsserver b/nagios-nrpe/files/plugins/check_nfsserver
index 80752bfd..3debccc4 100755
--- a/nagios-nrpe/files/plugins/check_nfsserver
+++ b/nagios-nrpe/files/plugins/check_nfsserver
@@ -1,12 +1,12 @@
 #!/bin/sh
 # Check if nfs server is running using rpcinfo
 
-rpcinfo -u localhost nfs
+rpcinfo -T udp localhost nfs 3
 if [ $? -ne 0 ]; then
     exit 2
 fi
 
-rpcinfo -t localhost nfs
+rpcinfo -T tcp localhost nfs
 if [ $? -ne 0 ]; then
     exit 2
 fi