--- Makefile.org	2014-08-17 09:19:51.000000000 -0400
+++ Makefile	2014-08-17 10:01:06.000000000 -0400
@@ -416,10 +416,9 @@
 
 oxp:	an
 	$(TOUCH) ip6
-	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS) gss" \
+	$(BUILD) BUILDTYPE=osx IP=$(IP6) EXTRAAUTHENTICATORS="$(EXTRAAUTHENTICATORS)" \
 	PASSWDTYPE=pam \
-	EXTRACFLAGS="$(EXTRACFLAGS) -DMAC_OSX_KLUDGE=1" \
-	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/System/Library/OpenSSL/certs SSLKEYS=/System/Library/OpenSSL/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib PAMDLFLAGS=-lpam"
+	SPECIALS="SSLINCLUDE=$(EPREFIX)/usr/include/openssl SSLLIB=$(EPREFIX)/usr/lib SSLCERTS=$(EPREFIX)/etc/ssl/certs SSLKEYS=$(EPREFIX)/etc/ssl/private GSSINCLUDE=$(EPREFIX)/usr/include GSSLIB=$(EPREFIX)/usr/lib PAMDLFLAGS=-lpam"
 
 osx:	osxok an
 	$(TOUCH) ip6