diff --git a/Configure b/Configure
index 2eba60d..6eb7f96 100755
--- a/Configure
+++ b/Configure
@@ -579,6 +579,7 @@
 my $no_shared=0; # but "no-shared" is default
 my $zlib=1;      # but "no-zlib" is default
 my $no_krb5=0;   # but "no-krb5" is implied unless "--with-krb5-..." is used
+my $rfc3779=1;	 # but "no-rfc3779" is default
 my $no_asm=0;
 my $no_dso=0;
 my $no_gmp=0;
@@ -614,6 +615,7 @@
 		 "gmp"		  => "default",
                  "mdc2"           => "default",
                  "rc5"            => "default",
+		 "rfc3779"	  => "default",
                  "shared"         => "default",
                  "zlib"           => "default",
                  "zlib-dynamic"   => "default"
@@ -901,6 +903,8 @@
 		{ $symlink = 0; }
 	elsif (/^sse2$/)
 		{ $no_sse2 = 1; }
+	elsif (/^rfc3779$/)
+		{ $rfc3779 = 0; }
 	else
 		{
 		my ($ALGO, $algo);
@@ -1137,6 +1141,11 @@
 		}
 	}
 
+if ($rfc3779)
+	{
+	$openssl_other_defines.="#define OPENSSL_RFC3779\n";
+	}
+
 # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
 my $shared_mark = "";
 if ($shared_target eq "")