1 files changed, 4 insertions, 0 deletions
diff --git a/g10/keygen.c b/g10/keygen.c
index 63c65111c..cb6770b64 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -523,6 +523,10 @@ keygen_set_std_prefs (const char *string,int personal)
 	xfree (prefstringbuf);
       }
 
+    /* For now we require a compat flag to set OCB into the preferences.  */
+    if (!(opt.compat_flags & COMPAT_VSD_ALLOW_OCB))
+      ocb = 0;
+
     if(!rc)
       {
 	if(personal)