diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b5fb178..2937a74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,16 +48,14 @@ CHECK_INCLUDE_FILES(execinfo.h HAVE_EXECINFO_H)
 
 # will be needed for auth
 CHECK_INCLUDE_FILES(crypt.h HAVE_CRYPT_H)
-IF(HAVE_CRYPT_H)
 # check if we need libcrypt for crypt_r()
-	CHECK_LIBRARY_EXISTS(crypt crypt_r "" HAVE_LIBCRYPT_CRYPT_R)
-	IF(HAVE_LIBCRYPT_CRYPT_R)
-		SET(HAVE_CRYPT_R 1 FORCE)
-		SET(HAVE_LIBCRYPT 1 FORCE)
-	ELSE(HAVE_LIBCRYPT_CRYPT_R)
-		CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT)
-	ENDIF(HAVE_LIBCRYPT_CRYPT_R)
-ENDIF(HAVE_CRYPT_H)
+CHECK_LIBRARY_EXISTS(crypt crypt_r "" HAVE_LIBCRYPT_CRYPT_R)
+IF(HAVE_LIBCRYPT_CRYPT_R)
+	SET(HAVE_CRYPT_R 1 FORCE)
+	SET(HAVE_LIBCRYPT 1 FORCE)
+ELSE(HAVE_LIBCRYPT_CRYPT_R)
+	CHECK_LIBRARY_EXISTS(crypt crypt "" HAVE_LIBCRYPT)
+ENDIF(HAVE_LIBCRYPT_CRYPT_R)
 CHECK_FUNCTION_EXISTS(crypt_r HAVE_CRYPT_R)
 
 CHECK_LIBRARY_EXISTS(kvm kvm_open "" HAVE_LIBKVM)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 97992c0..52dfec6 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -28,4 +28,4 @@ EXTRA_DIST=ip_parsers.rl
 
 liblighttpd2_common_la_SOURCES=$(common_src)
 liblighttpd2_common_la_CPPFLAGS=$(common_cflags) $(GTHREAD_CFLAGS) $(GMODULE_CFLAGS) $(LIBEV_CFLAGS)
-liblighttpd2_common_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS)
+liblighttpd2_common_la_LDFLAGS=-release $(PACKAGE_VERSION) -export-dynamic $(GTHREAD_LIBS) $(GMODULE_LIBS) $(LIBEV_LIBS) $(CRYPT_LIB)
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index fe9b3e6..9bff502 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -68,7 +68,7 @@ endif
 if WITH_PROFILER
 lighttpd_shared_src+= profiler.c
 endif
-EXTRA_lighttpd2_worker_SOURCES=$(lua_src) profiler.c
+EXTRA_liblighttpd2_shared_la_SOURCES=$(lua_src) profiler.c
 
 BUILT_SOURCES=config_parser.c http_range_parser.c http_request_parser.c http_response_parser.c url_parser.c
 
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 107445f..80428b2 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -22,7 +22,7 @@ libmod_accesslog_la_LIBADD = $(common_libadd)
 
 install_libs += libmod_auth.la
 libmod_auth_la_SOURCES = mod_auth.c
-libmod_auth_la_LDFLAGS = $(common_ldflags) $(CRYPT_LIB)
+libmod_auth_la_LDFLAGS = $(common_ldflags)
 libmod_auth_la_LIBADD = $(common_libadd)
 
 install_libs += libmod_balancer.la