diff --git a/security/shibboleth/Portfile b/security/shibboleth/Portfile
index 62ab8c6bdad..45d627fd63e 100644
--- a/security/shibboleth/Portfile
+++ b/security/shibboleth/Portfile
@@ -32,7 +32,6 @@ depends_lib         port:opensaml \
 master_sites        http://shibboleth.net/downloads/service-provider/${version}/
 distname            ${name}-sp-${version}
 use_bzip2           yes
-worksrcdir          ${name}-sp-${version}
 checksums           rmd160  954d411dc26a113406b3b9d3848cbe28adbd77d7 \
                     sha256  c4e92c11e56adaa5ea480aba1d78c5f30fbd5d1badb4a13bdd85684bd801298a \
                     size    838391
@@ -41,11 +40,14 @@ require_active_variants curl ssl
 
 use_autoreconf      yes
 autoreconf.args     -fvi
-configure.args      --enable-apache-24
+configure.args      --disable-odbc \
+                    --enable-apache-24 \
+                    --with-apxs24=${prefix}/bin/apxs \
+                    --without-gssapi
 
 variant odbc description {enable odbc support} {
         depends_lib-append port:unixODBC
-        configure.args-append --enable-odbc
+        configure.args-replace --disable-odbc --enable-odbc
 }
 
 destroot.keepdirs ${destroot}${prefix}/var/log/${name} ${destroot}${prefix}/var/run/${name} ${destroot}${prefix}/var/cache/${name}