diff --git a/Makefile.incl b/Makefile.incl
index e2d531150b..bb525c4513 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -46,6 +46,9 @@ $(LIBSCHED_FCGI):
 LIBBOINC = $(top_builddir)/lib/libboinc.la
 $(LIBBOINC):
 	cd $(top_builddir)/lib; ${MAKE} libboinc.la
+LIBBOINC_CRYPT = $(top_builddir)/lib/libboinc_crypt.la
+$(LIBBOINC_CRYPT):
+	cd $(top_builddir)/lib; ${MAKE} libboinc.la
 LIBBOINC_FCGI = $(top_builddir)/lib/libboinc_fcgi.la
 $(LIBBOINC_FCGI):
 	cd $(top_builddir)/lib; ${MAKE} libboinc_fcgi.la
diff --git a/checkin_notes b/checkin_notes
index 93bae77909..aed6d0a9cb 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6255,3 +6255,15 @@ David  10 July 2009
 
     lib/
         mfile.cpp
+
+Eric K  14 July 2009
+    - libraries:  Moved crypt.o out of libboinc and into libboinc_crypt.
+      Applications that need crypt.o will need to explicitly link
+      libboinc_crypt.
+
+    client/
+        Makefile.am
+    lib/
+	Makefile.am
+    Makefile.incl
+
diff --git a/client/Makefile.am b/client/Makefile.am
index cef6d6b2f7..6122ff4d7c 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -25,7 +25,7 @@ endif
 bin_PROGRAMS = boinc_client switcher boinccmd
 
 boinccmd_SOURCES = boinc_cmd.cpp
-boinccmd_DEPENDENCIES = $(LIBBOINC)
+boinccmd_DEPENDENCIES = $(LIBBOINC) 
 boinccmd_CPPFLAGS = $(AM_CPPFLAGS)
 boinccmd_LDFLAGS = $(AM_LDFLAGS) -L../lib 
 boinccmd_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS)
@@ -77,7 +77,7 @@ boinc_client_SOURCES = \
 boinc_client_DEPENDENCIES = $(LIBBOINC)
 boinc_client_CPPFLAGS = $(AM_CPPFLAGS)
 boinc_client_LDFLAGS = $(AM_LDFLAGS) -L../lib 
-boinc_client_LDADD = $(LIBBOINC) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS) 
+boinc_client_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT) $(BOINC_EXTRA_LIBS) $(PTHREAD_LIBS) 
 
 boinc_clientdir = $(bindir)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 37e174df5a..4e63566adb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -19,7 +19,6 @@ if ENABLE_LIBRARIES
 libfcgi_sources = \
     boinc_fcgi.cpp \
     coproc.cpp \
-    crypt.cpp \
     filesys.cpp \
     hostinfo.cpp \
     md5.c \
@@ -37,7 +36,6 @@ generic_sources = \
     base64.cpp \
     cert_sig.cpp \
     coproc.cpp \
-    crypt.cpp \
     diagnostics.cpp \
     filesys.cpp \
     gui_rpc_client.cpp \
@@ -131,12 +129,19 @@ noinst_HEADERS = \
     synch.h \
     unix_util.h
 
-lib_LTLIBRARIES = libboinc.la 
+lib_LTLIBRARIES = libboinc.la libboinc_crypt.la
 libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
 libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
 libboinc_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
-libboinc_la_LIBADD = $(LIBCURL)
+libboinc_la_LIBADD = 
+
+libboinc_crypt_la_SOURCES = crypt.cpp
+libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
+libboinc_crypt_la_LDFLAGS = -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_crypt_la_LIBADD = $(LIBCURL)
+
 
 if ENABLE_FCGI
 lib_LTLIBRARIES += libboinc_fcgi.la
@@ -152,15 +157,17 @@ endif
 # For example OS2
 if OS_OS2
 LIBBOINC_STATIC=boinc.${LIBEXT}
+LIBBOINC_CRYPT_STATIC=boinc_crypt.${LIBEXT}
 LIBBOINC_FCGI_STATIC=boinc_fcgi.${LIBEXT}
 else
 LIBBOINC_STATIC=libboinc.${LIBEXT}
+LIBBOINC_CRYPT_STATIC=libboinc_crypt.${LIBEXT}
 LIBBOINC_FCGI_STATIC=libboinc_fcgi.${LIBEXT}
 endif
 
 
 if BUILD_STATIC_LIBS
-all_local = $(LIBBOINC_STATIC)
+all_local = $(LIBBOINC_STATIC) $(LIBBOINC_CRTYPT_STATIC)
 if ENABLE_FCGI
 all_local += $(LIBBOINC_FCGI_STATIC) 
 endif
@@ -172,7 +179,11 @@ $(LIBBOINC_STATIC): libboinc.la
 	rm -f $(LIBBOINC_STATIC)
 	$(LN) .libs/$(LIBBOINC_STATIC) .
 
-libboinc_fcgi.a: libboinc_fcgi.la
+$(LIBBOINC_CRYPT_STATIC): libboinc_crypt.la
+	rm -f $(LIBBOINC_CRYPT_STATIC)
+	$(LN) .libs/$(LIBBOINC_CRYPT_STATIC)
+
+$(LIBBOINC_FCGI_STATIC): libboinc_fcgi.la
 	rm -f $(LIBBOINC_FCGI_STATIC)
 	$(LN) .libs/$(LIBBOINC_FCGI_STATIC) .
 
@@ -194,5 +205,5 @@ msg_test_CXXFLAGS = $(PTHREAD_CFLAGS)
 msg_test_LDADD = $(LIBBOINC)
 crypt_prog_SOURCES = crypt_prog.cpp 
 crypt_prog_CXXFLAGS = $(PTHREAD_CFLAGS)
-crypt_prog_LDADD = $(LIBBOINC) $(SSL_LIBS) 
+crypt_prog_LDADD = $(LIBBOINC) $(LIBBOINC_CRYPT_STATIC) $(SSL_LIBS) 
 
diff --git a/lib/shmem.h b/lib/shmem.h
index ff9daf0e73..a9d3903fa1 100644
--- a/lib/shmem.h
+++ b/lib/shmem.h
@@ -22,6 +22,9 @@
 
 #ifndef _WIN32
 #include <sys/types.h>
+#ifdef HAVE_SYS_SHM_H
+#include <sys/shm.h>
+#endif
 #endif
 
 // create_shmem(): create a shared-memory segment of the given size.