diff --git a/CHANGELOG b/CHANGELOG
index d3464e6..53bef93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+Maui 3.2.6p18
+
+  - Implemented NODEALLOCMAXPS patch from Bas van der Vlies
+  - Implemented minor bug patch from Ake Sandgren
+  - Implemented NODECFG[] MAXPROC[CLASS] patch from Yaroslav Halchenko
+
 Maui 3.2.6p16
 
   - Maui's 'configure' script now compatible with latest TORQUE versions
diff --git a/README b/README
index cef5b5b..aef03d6 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-                 Maui Scheduler, Release 3.2.6 (patch 16)
+                 Maui Scheduler, Release 3.2.6 (patch 18)
 
 This package contains the Maui Scheduler, an advance reservation based HPC 
 batch scheduler with extensive job management and resource optimization
diff --git a/configure b/configure
index 5fbfee6..ca5ac26 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.57 for maui 3.2.6p17.
+# Generated by GNU Autoconf 2.57 for maui 3.2.6p18.
 #
 # Report bugs to <help@supercluster.org>.
 #
@@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='maui'
 PACKAGE_TARNAME='maui'
-PACKAGE_VERSION='3.2.6p17'
-PACKAGE_STRING='maui 3.2.6p17'
+PACKAGE_VERSION='3.2.6p18'
+PACKAGE_STRING='maui 3.2.6p18'
 PACKAGE_BUGREPORT='help@supercluster.org'
 
 ac_unique_file="src/mcom/MConst.c"
@@ -780,7 +780,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 maui 3.2.6p17 to adapt to many kinds of systems.
+\`configure' configures maui 3.2.6p18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -837,7 +837,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of maui 3.2.6p17:";;
+     short | recursive ) echo "Configuration of maui 3.2.6p18:";;
    esac
   cat <<\_ACEOF
 
@@ -938,7 +938,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-maui configure 3.2.6p17
+maui configure 3.2.6p18
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -953,7 +953,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by maui $as_me 3.2.6p17, which was
+It was created by maui $as_me 3.2.6p18, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -6929,7 +6929,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by maui $as_me 3.2.6p17, which was
+This file was extended by maui $as_me 3.2.6p18, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6984,7 +6984,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-maui config.status 3.2.6p17
+maui config.status 3.2.6p18
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/contrib/Makefile b/contrib/Makefile
index be5b7a3..cc370b2 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -7,7 +7,7 @@ maui326:
 	ACTION=snap ; \
 	PKG=maui ; \
 	VERSION=3.2.6 ; \
-	PATCH=p10 ; \
+	PATCH=p18 ; \
 	BASEDIR=$$PKG-$$VERSION$$PATCH ; \
 	cd $$BASEDIR ; \
 	for i in src/[ms]* include; do \
diff --git a/include/header.cfg b/include/header.cfg
index 4a4c8e6..84df46c 100644
--- a/include/header.cfg
+++ b/include/header.cfg
@@ -1,4 +1,4 @@
-VERSION 3.2.6p16
+VERSION 3.2.6p18
 PACKAGE moab
 AUTHOR Cluster Resources, Inc
 
diff --git a/include/moab.h b/include/moab.h
index 54c168f..10df02a 100644
--- a/include/moab.h
+++ b/include/moab.h
@@ -7,7 +7,7 @@
 #include "moab-local.h"
 #include "mcom.h"
 
-#define MOAB_VERSION "3.2.6p14"
+#define MOAB_VERSION "3.2.6p18"
 
 /* elemental objects */
 
diff --git a/include/msched-version.h b/include/msched-version.h
index 567ef65..e4c2772 100644
--- a/include/msched-version.h
+++ b/include/msched-version.h
@@ -1 +1 @@
-#define MSCHED_VERSION "maui-3.2.6p16-snap.1148413868"
+#define MSCHED_VERSION "maui-3.2.6p18"
diff --git a/src/mcom/header.cfg b/src/mcom/header.cfg
index 4a4c8e6..84df46c 100644
--- a/src/mcom/header.cfg
+++ b/src/mcom/header.cfg
@@ -1,4 +1,4 @@
-VERSION 3.2.6p16
+VERSION 3.2.6p18
 PACKAGE moab
 AUTHOR Cluster Resources, Inc
 
diff --git a/src/moab/header.cfg b/src/moab/header.cfg
index 4a4c8e6..84df46c 100644
--- a/src/moab/header.cfg
+++ b/src/moab/header.cfg
@@ -1,4 +1,4 @@
-VERSION 3.2.6p16
+VERSION 3.2.6p18
 PACKAGE moab
 AUTHOR Cluster Resources, Inc
 
diff --git a/src/server/header.cfg b/src/server/header.cfg
index c3dc1fa..75e6d5a 100644
--- a/src/server/header.cfg
+++ b/src/server/header.cfg
@@ -1,4 +1,4 @@
-VERSION 3.2.6p16
+VERSION 3.2.6p18
 PACKAGE maui
 AUTHOR Cluster Resources, Inc