diff --git a/README b/README
index 0564de28b1e9a635fdb8e73101efcb4507295dc1..335da2dae0701e36cdedae97f085b54145567133 100644
--- a/README
+++ b/README
@@ -141,7 +141,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Change history
 --------------
 
-Version2.17b (12/16/2015)
+Version2.18a (12/16/2015)
 
 - Fixed quoting of simpleContent so that, e.g., "&" is exported
   as "&" and not as "&".  Thanks to Ardan Patwardha for
diff --git a/generateDS.py b/generateDS.py
index 0cc4c6d233c87a357101cec5c474c3ed6174fbb2..3fdd745582167cf885d904d5f9af8e92a7b65aa7 100755
--- a/generateDS.py
+++ b/generateDS.py
@@ -194,7 +194,7 @@ logging.disable(logging.INFO)
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-VERSION = '2.17a'
+VERSION = '2.18a'
 ##VERSION##
 
 GenerateProperties = 0
diff --git a/generateDS.txt b/generateDS.txt
index 44648c953af8deb98bc8a6d12002936fe9396b4d..77876b51bda7f4bed9cf9a4b6429581b0897ef26 100644
--- a/generateDS.txt
+++ b/generateDS.txt
@@ -12,7 +12,7 @@ generateDS -- Generate Data Structures from XML Schema
 
 .. version
 
-:revision: 2.17a
+:revision: 2.18a
 
 .. version
 
diff --git a/gui/generateds_gui.py b/gui/generateds_gui.py
index 0a77cbce41e9d89aab0540b994a2372f638e9427..c14d38e0ad43aed2ad9ee04702742edc5b83b9e5 100755
--- a/gui/generateds_gui.py
+++ b/gui/generateds_gui.py
@@ -31,7 +31,7 @@ from libgenerateDS.gui import generateds_gui_session
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-VERSION = '2.17a'
+VERSION = '2.18a'
 ##VERSION##
 
 
diff --git a/librarytemplate_howto.txt b/librarytemplate_howto.txt
index ab38257c8b51a73be8ae6c8409c7154fb635c73a..42ad6cfdf33a4799bafd52f1fba83f4907763750 100644
--- a/librarytemplate_howto.txt
+++ b/librarytemplate_howto.txt
@@ -8,7 +8,7 @@ How to package a generateDS.py generated library
 
 .. version
 
-:revision: 2.17a
+:revision: 2.18a
 
 .. version
 
diff --git a/process_includes.py b/process_includes.py
index 2abba61b41527386cc3e874da87784c5267a5a59..fcffe5ea7bcc3d66a75416a2d5d2c0be9b90be56 100755
--- a/process_includes.py
+++ b/process_includes.py
@@ -35,7 +35,7 @@ except ImportError:
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-VERSION = '2.17a'
+VERSION = '2.18a'
 ##VERSION##
 
 CatalogDict = {}
diff --git a/setup.py b/setup.py
index cb0f94be828a913a22b5e09dfcf6b87e2007cce6..46c108733b83cf70c29fc5a7e30b0ef352aa6b68 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ setup(name="generateDS",
 # Do not modify the following VERSION comments.
 # Used by updateversion.py.
 ##VERSION##
-    version="2.17a",
+    version="2.18a",
 ##VERSION##
     author="Dave Kuhlman",
     author_email="dkuhlman@davekuhlman.org",
diff --git a/tutorial/generateds_tutorial.txt b/tutorial/generateds_tutorial.txt
index 89a303f05b3771c5af02d6c7116cfc34e3ad27d6..dbb1fc41099f37d00282dacaf5d5fa5b6ac388be 100644
--- a/tutorial/generateds_tutorial.txt
+++ b/tutorial/generateds_tutorial.txt
@@ -11,7 +11,7 @@ generateDS -- Introduction and Tutorial
 
 .. version
 
-:revision: 2.17a
+:revision: 2.18a
 
 .. version