diff --git a/configure.ac b/configure.ac
index 26016f86af..5dcbca352b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1050,6 +1050,8 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${enable_client}" = yes])
 AM_CONDITIONAL(ENABLE_MANAGER, [ test "x${ac_cv_have_wxwidgets}" = xyes -a "${enable_manager}" = yes ])
 AM_CONDITIONAL(ENABLE_LIBRARIES, [test "${enable_libraries}" = yes])
 AM_CONDITIONAL(ENABLE_BOINCZIP, [test "${enable_boinczip}" = yes])
+AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "${enable_server}" = yes])
+AM_CONDITIONAL(ENABLE_BOINCCRYPT, [test "${enable_client}" = yes])
 AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
 AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 2e096f4760..55d06f05cb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -168,19 +168,21 @@ noinst_HEADERS = \
     synch.h \
     unix_util.h
 
-lib_LTLIBRARIES = libboinc.la libboinc_crypt.la
+lib_LTLIBRARIES = libboinc.la
 libboinc_la_SOURCES = $(generic_sources) $(mac_sources) $(win_sources)
 libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 libboinc_la_LIBADD =
 
+if ENABLE_BOINCCRYPT
+lib_LTLIBRARIES += libboinc_crypt.la
 libboinc_crypt_la_SOURCES = crypt.cpp
 libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CFLAGS)
 libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS) $(SSL_CXXFLAGS)
 libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -static -version-number $(LIBBOINC_VERSION)
 libboinc_crypt_la_LIBADD =
-
+endif
 
 if ENABLE_FCGI
 lib_LTLIBRARIES += libboinc_fcgi.la
@@ -206,7 +208,10 @@ endif
 
 
 if BUILD_STATIC_LIBS
-all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRYPT_STATIC)
+all_local = $(LIBBOINC_STATIC) 
+if ENABLE_BOINCCRYPT
+all_local += $(LIBBOINC_CRYPT_STATIC) 
+endif
 if ENABLE_FCGI
 all_local += $(LIBBOINC_FCGI_STATIC) 
 endif