diff -ur org.gridsite.core.orig/src/canl_mod_gridsite.c org.gridsite.core/src/canl_mod_gridsite.c
--- org.gridsite.core.orig/src/canl_mod_gridsite.c	2012-11-02 23:24:26.000000000 +0100
+++ org.gridsite.core/src/canl_mod_gridsite.c	2013-09-26 05:41:16.229784603 +0200
@@ -2071,7 +2071,7 @@
     
     if (strcasecmp(a->cmd->name, "GridSiteUserGroup") == 0)
     {
-      if (!(unixd_config.suexec_enabled))
+      if (!(ap_unixd_config.suexec_enabled))
           return "Using GridSiteUserGroup will "
                  "require rebuilding Apache with suexec support!";
     
@@ -3044,9 +3044,9 @@
 
     /* finally add IP credential */
     
-    if (r->connection->remote_ip)
+    if (r->connection->client_ip)
       {
-        cred = GRSTgaclCredCreate("ip:", r->connection->remote_ip);
+        cred = GRSTgaclCredCreate("ip:", r->connection->client_ip);
         GRSTgaclCredSetNotAfter(cred, GRST_MAX_TIME_T);
 
         if (user == NULL) user = GRSTgaclUserNew(cred);
@@ -3933,7 +3933,7 @@
             canl_ssl_ctx_set_clb(c_ctx, ctx, ctx->verify_mode,
                     GRST_callback_SSLVerify_wrapper);
 
-            if (main_server->loglevel >= APLOG_DEBUG)
+            if (main_server->log.level >= APLOG_DEBUG)
                  ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, main_server,
                       "Set mod_ssl verify callbacks to GridSite wrappers: %s",
                       canl_get_error_message(c_ctx));
@@ -3944,7 +3944,7 @@
 
    path = ap_server_root_relative(pPool, sessionsdir);
    apr_dir_make_recursive(path, APR_UREAD | APR_UWRITE | APR_UEXECUTE, pPool);
-   chown(path, unixd_config.user_id, unixd_config.group_id);
+   chown(path, ap_unixd_config.user_id, ap_unixd_config.group_id);
 
    canl_free_ctx(c_ctx);
    return OK;
@@ -3961,7 +3961,7 @@
    vasprintf(&mesg, fmt, ap);
    va_end(ap);
 
-   ap_log_error(file, line, level, 
+   ap_log_error(file, line, 0, level, 
                 0, mod_gridsite_log_func_server, "%s", mesg);
    
    free(mesg);
diff -ur org.gridsite.core.orig/src/mod_gridsite.c org.gridsite.core/src/mod_gridsite.c
--- org.gridsite.core.orig/src/mod_gridsite.c	2012-12-19 14:59:39.000000000 +0100
+++ org.gridsite.core/src/mod_gridsite.c	2013-09-26 05:41:16.753782626 +0200
@@ -2075,7 +2075,7 @@
     
     if (strcasecmp(a->cmd->name, "GridSiteUserGroup") == 0)
     {
-      if (!(unixd_config.suexec_enabled))
+      if (!(ap_unixd_config.suexec_enabled))
           return "Using GridSiteUserGroup will "
                  "require rebuilding Apache with suexec support!";
     
@@ -3050,9 +3050,9 @@
 
     /* finally add IP credential */
     
-    if (r->connection->remote_ip)
+    if (r->connection->client_ip)
       {
-        cred = GRSTgaclCredCreate("ip:", r->connection->remote_ip);
+        cred = GRSTgaclCredCreate("ip:", r->connection->client_ip);
         GRSTgaclCredSetNotAfter(cred, GRST_MAX_TIME_T);
 
         if (user == NULL) user = GRSTgaclUserNew(cred);
@@ -3576,7 +3576,7 @@
          * Log information about CRL
          * (A little bit complicated because of ASN.1 and BIOs...)
          */
-        if (s->loglevel >= APLOG_DEBUG) {
+        if (s->log.level >= APLOG_DEBUG) {
             char buff[512]; /* should be plenty */
             BIO *bio = BIO_new(BIO_s_mem());
 
@@ -3673,7 +3673,7 @@
             ASN1_INTEGER *sn = revoked->serialNumber;
 
             if (!ASN1_INTEGER_cmp(sn, X509_get_serialNumber(cert))) {
-                if (s->loglevel >= APLOG_DEBUG) {
+                if (s->log.level >= APLOG_DEBUG) {
                     char *cp = X509_NAME_oneline(issuer, NULL, 0);
                     char *serial = i2s_ASN1_INTEGER(NULL,sn);
 
@@ -3847,7 +3847,7 @@
     /*
      * Log verification information
      */
-    if (s->loglevel >= APLOG_DEBUG) 
+    if (s->log.level >= APLOG_DEBUG) 
       {
         X509 *cert  = X509_STORE_CTX_get_current_cert(ctx);
         char *sname = X509_NAME_oneline(X509_get_subject_name(cert), NULL, 0);
@@ -4552,7 +4552,7 @@
             SSL_CTX_set_verify(ctx, ctx->verify_mode, 
                                GRST_callback_SSLVerify_wrapper);
 
-            if (main_server->loglevel >= APLOG_DEBUG)
+            if (main_server->log.level >= APLOG_DEBUG)
                  ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, main_server,
                       "Set mod_ssl verify callbacks to GridSite wrappers");
           }
@@ -4562,7 +4562,7 @@
 
    path = ap_server_root_relative(pPool, sessionsdir);
    apr_dir_make_recursive(path, APR_UREAD | APR_UWRITE | APR_UEXECUTE, pPool);
-   chown(path, unixd_config.user_id, unixd_config.group_id);
+   chown(path, ap_unixd_config.user_id, ap_unixd_config.group_id);
 
    return OK;
 }
@@ -4578,7 +4578,7 @@
    vasprintf(&mesg, fmt, ap);
    va_end(ap);
 
-   ap_log_error(file, line, level, 
+   ap_log_error(file, line, 0, level, 
                 0, mod_gridsite_log_func_server, "%s", mesg);
    
    free(mesg);