diff --git a/NEWS b/NEWS
index 5af66e8..5ddadf4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
 This file documents the major additions and syntax changes between releases.
 
+2.3.5 18th Oct 2023
+	FIXES
+	* Include maxfd.h in lib Makefile
+
 2.3.4 18th Oct 2023
 	ENHANCEMENTS
 	* check_curl: added --cookie-jar and doing proper cleanup of libcurl
diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN
index 06a3eaf..2453774 100755
--- a/NP-VERSION-GEN
+++ b/NP-VERSION-GEN
@@ -6,7 +6,7 @@
 SRC_ROOT=`dirname $0`
 
 NPVF=NP-VERSION-FILE
-DEF_VER=2.3.4
+DEF_VER=2.3.5
 
 LF='
 '
diff --git a/THANKS b/THANKS
index 1668a15..3376921 100644
--- a/THANKS
+++ b/THANKS
@@ -2,19 +2,19 @@ This software is brought to you by the Monitoring Plugins Development Team. Howe
 there have been many contributors to this project. Everyone below has helped in 
 raising bug reports, creating patches or contributing new plugins.
 
-Thoralf Rickert-Wendt
-Matthias Hähnel
-Randy O'Meara
-dag rob?le
-Marc Sánchez
 Arkadiusz Miśkiewicz
-Aksel Sjögren
-fabiodds
+dag rob?le
+Matthias Döhler
+Marc Sánchez
+Wolfgang Karall-Ahlborn
+Thoralf Rickert-Wendt
 Diego Elio Pettenò
 Nicolai Søborg
 Elan Ruusamäe
-Matthias Döhler
-Wolfgang Karall-Ahlborn
+Matthias Hähnel
+fabiodds
+Aksel Sjögren
+Randy O'Meara
 Oskar Ahner
 Lance Albertson
 David Alden
@@ -89,9 +89,9 @@ Lee Clemens
 Ben Clewett
 Jean-Claude Computing
 Lionel Cons
+Ollie Cook
 Garry Cook
 Charlie Cook
-Ollie Cook
 Luca Corti
 Greg Cox
 Jason Crawford
@@ -130,13 +130,13 @@ Reuben Farrelly
 Mark Favas
 Duncan Ferguson
 Juan Carlos Fernandez
-Paulo Fessel
 Paulo Afonso Graner Fessel
+Paulo Fessel
 James Fidell
 Tobias Fiebig
 Roman Fiedler
-Bernhard Fischer
 Johan Fischer
+Bernhard Fischer
 Matthias Flacke
 Martin Foster
 Felix Frank
@@ -149,8 +149,8 @@ Tim Gates
 Sven Geggus
 Jonas Genannt
 Robby Giffin
-Florian Gleixner
 Flo Gleixner
+Florian Gleixner
 Evgeni Golov
 Joseph Gooch
 Aravind Gottipati
@@ -166,8 +166,8 @@ Sebastien Guay
 Linda Guo
 Jon Hallett
 Steve Hanselman
-Jacob Hansen
 Ask Bjoern Hansen
+Jacob Hansen
 Sebastian Harl
 Michael Haro
 Olli Hauer
@@ -247,8 +247,8 @@ Gerardo Malazdrewicz
 Ricardo Maraschini
 Michael Markstaller
 John Marquart
-Ernst-Dieter Martin
 Jason Martin
+Ernst-Dieter Martin
 Christopher Maser
 Mathieu Masseboeuf
 Alexander Matey
@@ -339,8 +339,8 @@ Sven Schaffranneck
 Christoph Schell
 Thomas Schimpke
 Benjamin Schmid
-Sebastian Schmidt
 Christian Schmidt
+Sebastian Schmidt
 Henning Schmiedehausen
 Christian Schneemann
 Cove Schneider
@@ -416,8 +416,8 @@ Shawn Wills
 Rob Windsor
 Mario Witte
 Alexander Wittig
-Brian De Wolf
 Tobias Wolf
+Brian De Wolf
 Eric Wunderlin
 Patric Wust
 Jamie Zawinski
diff --git a/configure b/configure
index ac3d96e..e5442c7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.4.
+# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='monitoring-plugins'
 PACKAGE_TARNAME='monitoring-plugins'
-PACKAGE_VERSION='2.3.4'
-PACKAGE_STRING='monitoring-plugins 2.3.4'
+PACKAGE_VERSION='2.3.5'
+PACKAGE_STRING='monitoring-plugins 2.3.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -2860,7 +2860,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures monitoring-plugins 2.3.4 to adapt to many kinds of systems.
+\`configure' configures monitoring-plugins 2.3.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -2932,7 +2932,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of monitoring-plugins 2.3.4:";;
+     short | recursive ) echo "Configuration of monitoring-plugins 2.3.5:";;
    esac
   cat <<\_ACEOF
 
@@ -3127,7 +3127,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-monitoring-plugins configure 2.3.4
+monitoring-plugins configure 2.3.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -3837,7 +3837,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by monitoring-plugins $as_me 2.3.4, which was
+It was created by monitoring-plugins $as_me 2.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4771,7 +4771,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='monitoring-plugins'
- VERSION='2.3.4'
+ VERSION='2.3.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -52333,7 +52333,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by monitoring-plugins $as_me 2.3.4, which was
+This file was extended by monitoring-plugins $as_me 2.3.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -52399,7 +52399,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-monitoring-plugins config.status 2.3.4
+monitoring-plugins config.status 2.3.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index de3796a..7eed920 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.64)
-AC_INIT(monitoring-plugins,2.3.4)
+AC_INIT(monitoring-plugins,2.3.5)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1a47395..dc3ee89 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
 	-I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
 libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c maxfd.c
-EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
+EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h maxfd.h
 
 if USE_PARSE_INI
 libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6ac69e2..22dc3f9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1786,7 +1786,7 @@ AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
 
 libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c \
 	utils_cmd.c maxfd.c $(am__append_1)
-EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
+EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h maxfd.h
 all: all-recursive
 
 .SUFFIXES:
diff --git a/lib/maxfd.h b/lib/maxfd.h
new file mode 100644
index 0000000..45218d0
--- /dev/null
+++ b/lib/maxfd.h
@@ -0,0 +1,9 @@
+#ifndef _MAXFD_
+#define _MAXFD_
+
+#define DEFAULT_MAXFD  256   /* fallback value if no max open files value is set */
+#define MAXFD_LIMIT   8192   /* upper limit of open files */
+
+long mp_open_max (void);
+
+#endif // _MAXFD_
diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo
index 2eb5447..75f7b70 100644
--- a/pkg/solaris/pkginfo
+++ b/pkg/solaris/pkginfo
@@ -2,11 +2,11 @@ PKG="NGOSplugin"
 NAME="monitoring-plugins"
 DESC="Network Monitoring Plugins for Nagios and compatible"
 ARCH="unknown"
-VERSION="2.3.4,REV=2023.10.17.15.43"
+VERSION="2.3.5,REV=2023.10.18.09.15"
 CATEGORY="application"
 VENDOR="Monitoring Plugins Development Team"
 EMAIL="devel@monitoring-plugins.org"
-PSTAMP="nag20231017154323"
+PSTAMP="nag20231018091518"
 BASEDIR="/"
 CLASSES="none"
 
diff --git a/release b/release
index 3f684d2..cc6c9a4 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-2.3.4
+2.3.5