diff --git a/ChangeLog b/ChangeLog
index 4a493d4..0df9cae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
 2009-02-18  David Ayers  <ayers@fsfe.org>
 
-	* configure.ac (enable-gui-projects): New option to disable builing
+	* configure.ac (disable-gui-projects): New option to disable builing
 	of projects depending -gui/AppKit.  Default to yes.
-	(enable-gorm-palette): Default to the setting for enable-gui-projects.
+	(disable-gorm-palette): Default to the setting for enable-gui-projects.
 	* configure: Regenerate.
 	* GNUmakefile.in: Extract all GUI libs into variable.
 
@@ -17,6 +17,11 @@
 	* Examples/Trading/GNUmakefile: Adapte to new location.
 	* Examples/GNUmakefile: Add Trading.
 
+	* configure.ac (enable-examples): Allow examples to be built from
+	top-level makefile.
+	* GNUmakefile.in: Ditto.
+	* configure: Regenerate.
+
 2009-02-18  Matt Rice  <ratmice@gmail.com>
 
 	* GNUmakefile.in: Add Trading subproject.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 890ae32..a693206 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -46,6 +46,8 @@ ifeq ($(GUI_LIB),apple)
 SUBPROJECTS += $(GUI_SUBPROJECTS)
 endif
 
+SUBPROJECTS += @EXAMPLE_SUBPROJECTS@
+
 DOCUMENT_NAME = GDL2
 
 GDL2_AGSDOC_FILES = GDL2.gsdoc
diff --git a/configure b/configure
index f7f49f3..535845a 100755
--- a/configure
+++ b/configure
@@ -671,6 +671,7 @@ SQLITE3_LIB_DIRS
 SQLITE3_LIBS
 EOADAPTORS
 GUI_SUBPROJECTS
+EXAMPLE_SUBPROJECTS
 VERSION
 MAJOR_VERSION
 MINOR_VERSION
@@ -1258,6 +1259,7 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-gui-projects to disable building GUI projects
   --disable-gorm-palette to disable building gorm palette
+  --enable-examples to enable building examples from top level
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -4084,6 +4086,19 @@ if test "$enable_gorm_palette" = "yes"; then
 fi
 
 
+EXAMPLE_SUBPROJECTS=""
+# Check whether --enable-examples was given.
+if test "${enable_examples+set}" = set; then
+  enableval=$enable_examples;
+else
+  enable_examples=no
+fi
+
+if test "$enable_examples" = "yes"; then
+  EXAMPLE_SUBPROJECTS=" Examples"
+fi
+
+
 #--------------------------------------------------------------------
 # Record the version
 #--------------------------------------------------------------------
@@ -4784,6 +4799,7 @@ SQLITE3_LIB_DIRS!$SQLITE3_LIB_DIRS$ac_delim
 SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
 EOADAPTORS!$EOADAPTORS$ac_delim
 GUI_SUBPROJECTS!$GUI_SUBPROJECTS$ac_delim
+EXAMPLE_SUBPROJECTS!$EXAMPLE_SUBPROJECTS$ac_delim
 VERSION!$VERSION$ac_delim
 MAJOR_VERSION!$MAJOR_VERSION$ac_delim
 MINOR_VERSION!$MINOR_VERSION$ac_delim
@@ -4793,7 +4809,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index c800c96..31740a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,6 +87,15 @@ if test "$enable_gorm_palette" = "yes"; then
 fi
 AC_SUBST(GUI_SUBPROJECTS)
 
+EXAMPLE_SUBPROJECTS=""
+AC_ARG_ENABLE(examples,
+	[  --enable-examples to enable building examples from top level], ,
+	enable_examples=no)
+if test "$enable_examples" = "yes"; then
+  EXAMPLE_SUBPROJECTS=" Examples"
+fi
+AC_SUBST(EXAMPLE_SUBPROJECTS)
+
 #--------------------------------------------------------------------
 # Record the version
 #--------------------------------------------------------------------