diff --git a/g10/main.h b/g10/main.h
index 768f7cfb8..86f8589b2 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -41,7 +41,9 @@
 # define DEFAULT_CIPHER_ALGO     CIPHER_ALGO_3DES
 #endif
 
-#if GCRYPT_VERSION_NUMBER < 0x019000
+/* We will start using OCB mode by default only if the yet to be
+ * released libgcrypt 1.9 is used.  */
+#if GCRYPT_VERSION_NUMBER < 0x010900
 # define DEFAULT_AEAD_ALGO  AEAD_ALGO_OCB
 #else
 # define DEFAULT_AEAD_ALGO  AEAD_ALGO_EAX