diff -ur voms-1.9.11.orig/src/ac/Makefile.am voms-1.9.11/src/ac/Makefile.am
--- voms-1.9.11.orig/src/ac/Makefile.am	2009-07-16 15:10:39.000000000 +0200
+++ voms-1.9.11/src/ac/Makefile.am	2009-09-07 11:06:49.079471423 +0200
@@ -27,6 +27,7 @@
 	-DNOGLOBUS \
 	-I $(top_srcdir)/src/include \
 	-I $(top_builddir)/src/sslutils
+libattributes_nog_la_CXXFLAGS = $(libattributes_nog_la_CFLAGS)
 
 libattributes_nog_la_LIBADD = \
 	$(OPENSSL_LIBS)
diff -ur voms-1.9.11.orig/src/api/ccapi/api_util.cc voms-1.9.11/src/api/ccapi/api_util.cc
--- voms-1.9.11.orig/src/api/ccapi/api_util.cc	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/api/ccapi/api_util.cc	2009-09-07 11:06:49.080471703 +0200
@@ -415,9 +415,9 @@
   /* extract vo name from AC */
   
   AC * ac = (AC *)data;
-  STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
+  const STACK_OF(AC_ATTR) * atts = ac->acinfo->attrib;
   int nid = OBJ_txt2nid("idatcap");
-  int pos = X509at_get_attr_by_NID(atts, nid, -1);
+  int pos = X509at_get_attr_by_NID((const STACK_OF(X509_ATTRIBUTE)*)atts, nid, -1);
 
   int nidc = OBJ_txt2nid("certseq");
   STACK_OF(X509_EXTENSION) *exts = ac->acinfo->exts;
diff -ur voms-1.9.11.orig/src/include/acstack.h voms-1.9.11/src/include/acstack.h
--- voms-1.9.11.orig/src/include/acstack.h	2009-07-16 15:10:40.000000000 +0200
+++ voms-1.9.11/src/include/acstack.h	2009-09-07 11:06:49.081472345 +0200
@@ -79,7 +79,7 @@
 #endif
 
 #define DECL_STACK(type) \
-   DECLARE_STACK_OF(type) \
+   PREDECLARE_STACK_OF(type) \
    extern STACK_OF(type) *sk_##type##_new (int (*)(const type * const *, const type * const *)); \
    extern STACK_OF(type) *sk_##type##_new_null (); \
    extern void   sk_##type##_free (STACK_OF(type) *); \
diff -ur voms-1.9.11.orig/src/socklib/Client.cpp voms-1.9.11/src/socklib/Client.cpp
--- voms-1.9.11.orig/src/socklib/Client.cpp	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/socklib/Client.cpp	2009-09-07 11:28:07.210471657 +0200
@@ -336,7 +336,11 @@
 bool 
 GSISocketClient::Open()
 {
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *meth = NULL;
+#else
   SSL_METHOD *meth = NULL;
+#endif
   int ret = -1, ret2 = -1;
   time_t starttime, curtime;
   long errorcode = 0;
diff -ur voms-1.9.11.orig/src/utils/vomsfake.cc voms-1.9.11/src/utils/vomsfake.cc
--- voms-1.9.11.orig/src/utils/vomsfake.cc	2009-07-16 15:10:41.000000000 +0200
+++ voms-1.9.11/src/utils/vomsfake.cc	2009-09-07 10:21:52.935470664 +0200
@@ -40,6 +40,7 @@
 #include "listfunc.h"
 #include "credentials.h"
 #include "parsertypes.h"
+#define YYTOKENTYPE
 #include "vomsparser.h"
 
 VOLIST *volist = NULL;