diff --git a/build-aux/m4/buildsys.m4 b/build-aux/m4/buildsys.m4
index 3cabdbb..aa9576a 100644
--- a/build-aux/m4/buildsys.m4
+++ b/build-aux/m4/buildsys.m4
@@ -309,6 +309,7 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
 
 			AC_SUBST(FRAMEWORK_LDFLAGS)
 			AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
+			AC_SUBST(FRAMEWORK_LIBS)
 
 			$1
 			;;
diff --git a/buildsys.mk.in b/buildsys.mk.in
index b77b5f3..f5d9362 100644
--- a/buildsys.mk.in
+++ b/buildsys.mk.in
@@ -63,6 +63,7 @@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
 PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
 FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@
 FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@
+FRAMEWORK_LIBS = @FRAMEWORK_LIBS@
 CODESIGN = @CODESIGN@
 CODESIGN_IDENTITY ?= -
 CLEAN_LIB = @CLEAN_LIB@
@@ -191,7 +192,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
 ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
 	${LINK_STATUS}
 	out="$@"; \
-	if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} --timestamp=none $$out; then \
+	if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
 		${LINK_OK}; \
 	else \
 		rm -fr $$out; false; \
diff --git a/configure.ac b/configure.ac
index 887af3e..806166a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ CPP="$OBJCPP"
 CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS $($OBJFW_CONFIG --cppflags)"
 OBJCFLAGS="$OBJCFLAGS -Wall $($OBJFW_CONFIG --objcflags)"
 LDFLAGS="$LDFLAGS $($OBJFW_CONFIG --ldflags --rpath)"
-AC_SUBST(OBJFW_LIBS, "$($OBJFW_CONFIG --libs)")
-AC_SUBST(OBJFW_FRAMEWORK_LIBS, "$($OBJFW_CONFIG --framework-libs)")
+FRAMEWORK_LIBS="$($OBJFW_CONFIG --framework-libs)"
+LIBS="$($OBJFW_CONFIG --libs --rpath)"
 
 AX_CHECK_COMPILER_FLAGS(-Wdocumentation,
 	[OBJCFLAGS="$OBJCFLAGS -Wdocumentation"])
@@ -55,12 +55,14 @@ AS_IF([test x"$with_openssl" != x"no" -a x"$with_openssl" != x""], [
        OPENSSL_CPPFLAGS="$OPENSSL_CFLAGS -I$with_openssl/include"
        OPENSSL_LIBS="$OPENSSL_LIBS -L$with_openssl/lib"
        CPPFLAGS="$CPPFLAGS -I$with_openssl/include"
-       LIBS="$LIBS -L$with_openssl/lib"
+       LIBS="-L$with_openssl/lib $LIBS"
+       FRAMEWORK_LIBS="-L$with_openssl/lib $FRAMEWORK_LIBS"
 ])
 
 AC_CHECK_LIB(ssl, main, [
 	OPENSSL_LIBS="$OPENSSL_LIBS -lssl -lcrypto"
 	LIBS="$LIBS -lssl -lcrypto"
+	FRAMEWORK_LIBS="$FRAMEWORK_LIBS -lssl -lcrypto"
 ], [
 	AC_MSG_ERROR(You need openssl >= 1.0.2 installed!)
 ], [-lcrypto])
diff --git a/extra.mk.in b/extra.mk.in
index 647d27b..8eb2ec7 100644
--- a/extra.mk.in
+++ b/extra.mk.in
@@ -3,5 +3,3 @@ OBJOPENSSL_STATIC_LIB = @OBJOPENSSL_STATIC_LIB@
 OBJOPENSSL_FRAMEWORK = @OBJOPENSSL_FRAMEWORK@
 
 OBJFW_CONFIG = @OBJFW_CONFIG@
-OBJFW_FRAMEWORK_LIBS = @OBJFW_FRAMEWORK_LIBS@
-OBJFW_LIBS = @OBJFW_LIBS@
diff --git a/src/Makefile b/src/Makefile
index bca31ba..f38d3f4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -17,5 +17,3 @@ INCLUDES = ${SRCS:.m=.h}	\
 include ../buildsys.mk
 
 LD = ${OBJC}
-FRAMEWORK_LIBS := ${OBJFW_FRAMEWORK_LIBS} ${LIBS}
-LIBS := ${OBJFW_LIBS} ${LIBS}