diff --git a/INSTALL.txt b/INSTALL.txt
index 33fc4c912..8c8ab22c0 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -215,6 +215,10 @@ The configure options which are specific to the Gambit-C system are:
   --enable-help-browser=BROWSER
                           use the specified browser to view documentation
                           requested through the help procedure or REPL
+  --enable-type-checking
+                          cause primitives to perform type checking
+                          of their arguments
+                          (requires: make bootstrap; make bootclean; make)
   --enable-auto-forcing
                           cause strict operations such as car, but not
                           cons, to automatically force their arguments
diff --git a/configure b/configure
index 4e9cb6074..e81d4a75c 100755
--- a/configure
+++ b/configure
@@ -1520,6 +1520,7 @@ Optional Features:
                           absolute path (default is YES)
   --enable-help-browser=BROWSER
                           Browser to use for help (default is to search)
+  --enable-type-checking  perform type checking (default is YES)
   --enable-auto-forcing   automatically force promises (default is NO)
 
 Optional Packages:
@@ -2179,7 +2180,7 @@ DEFS_EXE=""
 
 DEFS_OBJ_DYN_LIB_EXE=""
 
-COMPILATION_OPTIONS="-check"
+COMPILATION_OPTIONS=""
 
 ###############################################################################
 #
@@ -5798,6 +5799,26 @@ else
 fi
 
 
+###############################################################################
+#
+# Check if the system must perform type checking.
+
+# Check whether --enable-type-checking was given.
+if test "${enable_type_checking+set}" = set; then
+  enableval=$enable_type_checking; ENABLE_TYPE_CHECKING=$enableval
+else
+  ENABLE_TYPE_CHECKING=yes
+fi
+
+
+echo "ENABLE_TYPE_CHECKING = $ENABLE_TYPE_CHECKING"
+
+if test "$ENABLE_TYPE_CHECKING" = yes; then
+
+  COMPILATION_OPTIONS="$COMPILATION_OPTIONS -check"
+
+fi
+
 ###############################################################################
 #
 # Check if the system must automatically force promises.
diff --git a/configure.ac b/configure.ac
index abc016e49..a40d14028 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ DEFS_EXE=""
 
 DEFS_OBJ_DYN_LIB_EXE=""
 
-COMPILATION_OPTIONS="-check"
+COMPILATION_OPTIONS=""
 
 ###############################################################################
 #
@@ -502,6 +502,24 @@ AC_ARG_ENABLE(help-browser,
               HELP_BROWSER=$enableval,
               HELP_BROWSER="")
 
+###############################################################################
+#
+# Check if the system must perform type checking.
+
+AC_ARG_ENABLE(type-checking,
+              AC_HELP_STRING([--enable-type-checking],
+                             [perform type checking (default is YES)]),
+              ENABLE_TYPE_CHECKING=$enableval,
+              ENABLE_TYPE_CHECKING=yes)
+
+echo "ENABLE_TYPE_CHECKING = $ENABLE_TYPE_CHECKING"
+
+if test "$ENABLE_TYPE_CHECKING" = yes; then
+
+  COMPILATION_OPTIONS="$COMPILATION_OPTIONS -check"
+
+fi
+
 ###############################################################################
 #
 # Check if the system must automatically force promises.
diff --git a/include/stamp.h b/include/stamp.h
index 0e1305974..02fa96244 100644
--- a/include/stamp.h
+++ b/include/stamp.h
@@ -3,4 +3,4 @@
  */
 
 #define ___STAMP_YMD 20120613
-#define ___STAMP_HMS 150636
+#define ___STAMP_HMS 152614