--- ./modules/ssl/ssl_engine_vars.c.orig	2008-05-31 12:44:10.000000000 +0200
+++ ./modules/ssl/ssl_engine_vars.c	2008-05-31 12:44:18.000000000 +0200
@@ -412,11 +412,7 @@
     { "G",     NID_givenName              },
     { "S",     NID_surname                },
     { "D",     NID_description            },
-#ifdef NID_x500UniqueIdentifier /* new name as of Openssl 0.9.7 */
-    { "UID",   NID_x500UniqueIdentifier   },
-#else /* old name, OpenSSL < 0.9.7 */
-    { "UID",   NID_uniqueIdentifier       },
-#endif
+    { "UID",   NID_userId                 }, /* officially see RFC 4514 */
     { "Email", NID_pkcs9_emailAddress     },
     { NULL,    0                          }
 };