diff --git a/CHANGES.current b/CHANGES.current
index 88f36b9ed..1bb800493 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,9 @@
 Version 1.3.36 (24 June 2008)
 =============================
 
+06/24/2008: wsfulton
+            Remove deprecated -c commandline option (runtime library generation).
+
 06/24/2008: olly
 	    [PHP] Fix assertion failure when handling %typemap(in,numinputs=0)
 	    (testcase ignore_parameter).
diff --git a/Doc/Manual/Warnings.html b/Doc/Manual/Warnings.html
index 39d5d3f01..0b3cb37e9 100644
--- a/Doc/Manual/Warnings.html
+++ b/Doc/Manual/Warnings.html
@@ -373,7 +373,7 @@ example.i(4): Syntax error in input.
 <li>117. Deprecated <tt>%new</tt> directive.
 <li>118. Deprecated <tt>%typemap(except)</tt>.
 <li>119. Deprecated <tt>%typemap(ignore)</tt>.
-<li>120. Deprecated command line option (-c).
+<li>120. Deprecated command line option (-runtime, -noruntime).
 <li>121. Deprecated <tt>%name</tt> directive.
 </ul>
 
diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
index 3453f5de2..c99a2e540 100644
--- a/Source/Modules/main.cxx
+++ b/Source/Modules/main.cxx
@@ -33,7 +33,7 @@ int GenerateDefault = 1;	// Generate default constructors
 int Verbose = 0;
 int AddExtern = 0;
 int NoExcept = 0;
-int SwigRuntime = 0;		// 0 = no option, 1 = -c or -runtime, 2 = -noruntime
+int SwigRuntime = 0;		// 0 = no option, 1 = -runtime, 2 = -noruntime
 
 /* Suppress warning messages for private inheritance, preprocessor evaluation etc...
    WARN_PP_EVALUATION            202
@@ -493,11 +493,11 @@ void SWIG_getoptions(int argc, char *argv[]) {
 	Swig_mark_arg(i);
       } else if (strcmp(argv[i], "-runtime") == 0) {
 	Swig_mark_arg(i);
-	Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-c, -runtime, -noruntime command line options are deprecated.\n");
+	Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n");
 	SwigRuntime = 1;
-      } else if ((strcmp(argv[i], "-c") == 0) || (strcmp(argv[i], "-noruntime") == 0)) {
+      } else if (strcmp(argv[i], "-noruntime") == 0) { // Used to also accept -c. removed in swig-1.3.36
 	Swig_mark_arg(i);
-	Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-c, -runtime, -noruntime command line options are deprecated.\n");
+	Swig_warning(WARN_DEPRECATED_OPTC, "SWIG", 1, "-runtime, -noruntime command line options are deprecated.\n");
 	SwigRuntime = 2;
       } else if (strcmp(argv[i], "-external-runtime") == 0) {
 	external_runtime = 1;