--- pegasus/rpm/manLinux/man1.Z/cimprovider.1.obz5046	2004-12-08 04:40:38.000000000 -0500
+++ pegasus/rpm/manLinux/man1.Z/cimprovider.1	2006-05-31 13:43:51.000000000 -0400
@@ -146,11 +146,13 @@
 Error
 .PD
 .RE
-.SH "USAGE NOTE"
+.SH "USAGE NOTES"
 .PP 
 The 
 .B cimprovider 
 command requires that the CIM Server is running.
+If an operation requires more than two minutes to complete, the cimprovider 
+command prints a timeout message and returns an error value.
 .SH "EXAMPLES "
 .PP 
 Disable provider module "OperatingSystemProvider" and 
--- pegasus/src/Clients/cimprovider/CIMProviderCommand.cpp.obz5046	2006-01-30 11:16:33.000000000 -0500
+++ pegasus/src/Clients/cimprovider/CIMProviderCommand.cpp	2006-05-31 14:02:17.000000000 -0400
@@ -69,6 +69,8 @@
 #include "OS400ConvertChar.h"
 #endif
 
+#define CIMPROVIDERCOMMAND_CLIENT_DEFAULTTIMEOUT 120000
+
 PEGASUS_USING_STD;
 
 PEGASUS_NAMESPACE_BEGIN
@@ -1145,6 +1147,7 @@
         // Construct the CIMClient and set to request server messages
         // in the default language of this client process.
         _client.reset(new CIMClient);//PEP101
+        _client->setTimeout(CIMPROVIDERCOMMAND_CLIENT_DEFAULTTIMEOUT);
         _client->setRequestDefaultLanguages(); //l10n
     }
     catch (Exception & e)