diff --git a/Makefile.defs b/Makefile.defs
index 745d689f6d432fe8d5c81739bbf26197c4218498..846b52e0f636cb69b7effc04fb0d0997ec030c36 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -1,7 +1,4 @@
 
-#short_hostname := $(shell hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]')
-#NACL_ABI := $(shell $(top_srcdir)/lib/nacl-20110221/printabi.debian)
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src
 AM_LDFLAGS = \
diff --git a/configure.ac b/configure.ac
index 7b928a8deb79a38c1ea5a1f4c8a04f6613a2b56e..e7d07aa6bcf1a3ba7efc6bd64256f5383b353f0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,8 @@ LIBS="$PTHREAD_LIBS $LIBS"
 
 dnl libsodium
 PKG_CHECK_MODULES(SODIUM, libsodium)
+AC_SUBST(SODIUM_CFLAGS)
+AC_SUBST(SODIUM_LIBS)
 CXXFLAGS="$CXXFLAGS $SODIUM_CFLAGS"
 LIBS="$LIBS $SODIUM_LIBS"
 
diff --git a/src/mod_sso/Makefile.am b/src/mod_sso/Makefile.am
index 2db30a3e6713f524e9abbd4098f36846454497ae..34251d37117e6b6d31a7c57f1b2414be60810733 100644
--- a/src/mod_sso/Makefile.am
+++ b/src/mod_sso/Makefile.am
@@ -18,6 +18,6 @@ install-exec-local:
 
 mod_sso.la: libmod_sso.la
 	$(APXS) -c -o $@ $< $(AM_LDFLAGS) $(APACHE_CFLAGS) \
-		$(SSO_LIBS) $(NACL_LIBS) -lstdc++
+		$(SSO_LIBS) $(SODIUM_LIBS) -lstdc++