diff --git a/cross/monitoring-plugins/Makefile b/cross/monitoring-plugins/Makefile
index 83ba2eb8db9..c0abcd5c286 100644
--- a/cross/monitoring-plugins/Makefile
+++ b/cross/monitoring-plugins/Makefile
@@ -1,17 +1,21 @@
PKG_NAME = monitoring-plugins
-PKG_VERS = 2.2
+PKG_VERS = 2.3.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://www.monitoring-plugins.org/download/
+PKG_DIST_SITE = https://github.com/monitoring-plugins/monitoring-plugins/releases/download/v$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
-DEPENDS =
-
HOMEPAGE = https://www.monitoring-plugins.org
COMMENT = Standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu, and other monitoring applications.
LICENSE = GPLv3
GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --without-openssl --libexecdir=$(INSTALL_PREFIX)/bin --with-sudo-command=/bin/sudo --with-rpcinfo-command=/sbin/rpcinfo --with-smbclient-command=/bin/smbclient
+CONFIGURE_ARGS = --disable-static
+CONFIGURE_ARGS += --without-openssl
+CONFIGURE_ARGS += --libexecdir=$(INSTALL_PREFIX)/bin
+CONFIGURE_ARGS += --with-sudo-command=/bin/sudo
+CONFIGURE_ARGS += --with-rpcinfo-command=/sbin/rpcinfo
+CONFIGURE_ARGS += --with-smbclient-command=/bin/smbclient
+CONFIGURE_ARGS += --without-apt-get-command
include ../../mk/spksrc.cross-cc.mk
diff --git a/cross/monitoring-plugins/PLIST b/cross/monitoring-plugins/PLIST
index 513280a31ff..9a37c96953f 100644
--- a/cross/monitoring-plugins/PLIST
+++ b/cross/monitoring-plugins/PLIST
@@ -1,14 +1,12 @@
rsc:bin/check_breeze
rsc:bin/check_clamd
bin:bin/check_cluster
-rsc:bin/check_dhcp
bin:bin/check_disk
rsc:bin/check_disk_smb
bin:bin/check_dummy
rsc:bin/check_file_age
rsc:bin/check_ftp
bin:bin/check_http
-bin:bin/check_icmp
bin:bin/check_ide_smart
rsc:bin/check_ifoperstatus
rsc:bin/check_ifstatus
@@ -40,6 +38,7 @@ bin:bin/check_tcp
bin:bin/check_time
rsc:bin/check_udp
bin:bin/check_ups
+rsc:bin/check_uptime
bin:bin/check_users
rsc:bin/check_wave
bin:bin/negate
diff --git a/cross/monitoring-plugins/digests b/cross/monitoring-plugins/digests
index bf790778707..e45f03480d3 100644
--- a/cross/monitoring-plugins/digests
+++ b/cross/monitoring-plugins/digests
@@ -1,3 +1,3 @@
-monitoring-plugins-2.2.tar.gz SHA1 902375589354fa2442e106a98595086aa6a21b91
-monitoring-plugins-2.2.tar.gz SHA256 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665
-monitoring-plugins-2.2.tar.gz MD5 549e243ba1fb5c5b3be3a86961de40a7
+monitoring-plugins-2.3.1.tar.gz SHA1 8cb4d72920ed99ff922b6989fe5213ea76b9388e
+monitoring-plugins-2.3.1.tar.gz SHA256 f56eb84871983fd719247249e3532228b37e2efaae657a3979bd14ac1f84a35b
+monitoring-plugins-2.3.1.tar.gz MD5 1bc8d5f1fec4f8ea9746f0d9fafd873a
diff --git a/spk/monitoring-plugins/Makefile b/spk/monitoring-plugins/Makefile
index 8bff2f84849..e5e423b6002 100644
--- a/spk/monitoring-plugins/Makefile
+++ b/spk/monitoring-plugins/Makefile
@@ -1,16 +1,66 @@
SPK_NAME = monitoring-plugins
-SPK_VERS = 2.2
-SPK_REV = 1
-SPK_ICON = src/img.png
+SPK_VERS = 2.3.1
+SPK_REV = 2
+SPK_ICON = src/monitoring-plugins.png
DEPENDS = cross/$(SPK_NAME)
+SPK_DEPENDS = Perl
+
MAINTAINER = Gagi2k
DESCRIPTION = Standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu, and other monitoring applications.
+CHANGELOG = "1. Update monitoring-plugins to v2.3.1
2. Add Perl package as requirement.
3. Link the check commands to /usr/local/bin."
STARTABLE = no
DISPLAY_NAME = Monitoring Plugins
HOMEPAGE = https://www.monitoring-plugins.org
LICENSE = GPLv3
+SPK_COMMANDS = bin/check_breeze
+SPK_COMMANDS += bin/check_clamd
+SPK_COMMANDS += bin/check_cluster
+SPK_COMMANDS += bin/check_disk
+SPK_COMMANDS += bin/check_disk_smb
+SPK_COMMANDS += bin/check_dummy
+SPK_COMMANDS += bin/check_file_age
+SPK_COMMANDS += bin/check_ftp
+SPK_COMMANDS += bin/check_http
+SPK_COMMANDS += bin/check_ide_smart
+SPK_COMMANDS += bin/check_ifoperstatus
+SPK_COMMANDS += bin/check_ifstatus
+SPK_COMMANDS += bin/check_imap
+SPK_COMMANDS += bin/check_ircd
+SPK_COMMANDS += bin/check_load
+SPK_COMMANDS += bin/check_log
+SPK_COMMANDS += bin/check_mailq
+SPK_COMMANDS += bin/check_mrtg
+SPK_COMMANDS += bin/check_mrtgtraf
+SPK_COMMANDS += bin/check_nagios
+SPK_COMMANDS += bin/check_nntp
+SPK_COMMANDS += bin/check_nt
+SPK_COMMANDS += bin/check_ntp
+SPK_COMMANDS += bin/check_ntp_peer
+SPK_COMMANDS += bin/check_ntp_time
+SPK_COMMANDS += bin/check_nwstat
+SPK_COMMANDS += bin/check_oracle
+SPK_COMMANDS += bin/check_overcr
+SPK_COMMANDS += bin/check_ping
+SPK_COMMANDS += bin/check_pop
+SPK_COMMANDS += bin/check_procs
+SPK_COMMANDS += bin/check_real
+SPK_COMMANDS += bin/check_rpc
+SPK_COMMANDS += bin/check_smtp
+SPK_COMMANDS += bin/check_ssh
+SPK_COMMANDS += bin/check_swap
+SPK_COMMANDS += bin/check_tcp
+SPK_COMMANDS += bin/check_time
+SPK_COMMANDS += bin/check_udp
+SPK_COMMANDS += bin/check_ups
+SPK_COMMANDS += bin/check_uptime
+SPK_COMMANDS += bin/check_users
+SPK_COMMANDS += bin/check_wave
+# must be found in /usr/local/bin too:
+SPK_COMMANDS += bin/utils.sh
+SPK_COMMANDS += bin/utils.pm
+
include ../../mk/spksrc.spk.mk
diff --git a/spk/monitoring-plugins/src/img.png b/spk/monitoring-plugins/src/monitoring-plugins.png
similarity index 100%
rename from spk/monitoring-plugins/src/img.png
rename to spk/monitoring-plugins/src/monitoring-plugins.png