diff --git a/Source/cmCommands.cxx b/Source/cmCommands.cxx
index 28658062c..801a6466c 100644
--- a/Source/cmCommands.cxx
+++ b/Source/cmCommands.cxx
@@ -47,6 +47,7 @@
 #include "cmElseCommand.cxx"
 #include "cmEndIfCommand.cxx"
 #include "cmAddDefinitionsCommand.cxx"
+#include "cmOptionCommand.cxx"
 
 void GetPredefinedCommands(std::list<cmCommand*>& commands)
 {
@@ -91,6 +92,7 @@ void GetPredefinedCommands(std::list<cmCommand*>& commands)
   commands.push_back(new cmElseCommand);
   commands.push_back(new cmEndIfCommand);
   commands.push_back(new cmAddDefinitionsCommand);
+  commands.push_back(new cmOptionCommand);
 }
 
   
diff --git a/Source/cmWrapTclCommand.cxx b/Source/cmWrapTclCommand.cxx
index a7c0c12f9..c88b486d3 100644
--- a/Source/cmWrapTclCommand.cxx
+++ b/Source/cmWrapTclCommand.cxx
@@ -28,20 +28,9 @@ bool cmWrapTclCommand::Invoke(std::vector<std::string>& args)
   // already, if so use that value and don't look for the program
   const char* cacheValue
     = cmCacheManager::GetInstance()->GetCacheValue("WRAP_TCL");
-  if(!cacheValue)
+  if(!cacheValue || !strcmp(cacheValue,"0"))
     {
-    cmCacheManager::GetInstance()->AddCacheEntry("WRAP_TCL","1",
-                                                 cmCacheManager::BOOL);
-    m_Makefile->AddDefinition("WRAP_TCL", "1");
-    }
-  else
-    {
-    m_Makefile->AddDefinition("WRAP_TCL", cacheValue);
-    // if it is turned off then return
-    if (!strcmp(cacheValue,"0"))
-      {
-      return true;
-      }
+    return true;
     }
 
   // add in a depend in the vtkWrapTcl executable