diff --git a/Makefile.in b/Makefile.in
index 334d653c..4a2321ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -93,7 +93,7 @@ znc: $(BIN_OBJS) $(LIBZNC)
 
 $(LIBZNC): $(LIB_OBJS)
 	$(E) Linking $(LIBZNC)...
-	$(Q)$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS)
+	$(Q)$(CXX) $(LDFLAGS) -shared -o $@ $(LIB_OBJS) $(LIBS) -Wl,--out-implib=libznc.dll.a
 endif
 
 unittest: $(LIB_OBJS) test/gtest-all.o test/gtest-main.o $(TESTS)
@@ -188,6 +188,7 @@ install: znc $(LIBZNC)
 	if test -n "$(LIBZNC)"; then \
 		test -d $(DESTDIR)$(LIBZNCDIR) || $(INSTALL) -d $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
 		$(INSTALL_PROGRAM) $(LIBZNC) $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
+		$(INSTALL_PROGRAM) libznc.dll.a $(DESTDIR)$(libdir) || exit 1 ; \
 	fi
 	@$(MAKE) -C man install DESTDIR=$(DESTDIR)
 	@HAVE_SYSTEMD_TRUE@test -d $(DESTDIR)$(systemdsystemunitdir) || $(INSTALL) -d $(DESTDIR)$(systemdsystemunitdir)
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 414d6e52..c069cdd0 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -63,7 +63,7 @@ C=
 endif
 
 ifneq "$(LIBZNC)" ""
-LDFLAGS += -L.. -lznc-$(LIBZNC_VERSION) -Wl,-rpath,$(LIBZNCDIR)
+LIBS += -L.. -lznc-$(LIBZNC_VERSION) -Wl,-rpath,$(LIBZNCDIR)
 endif
 
 CLEAN    :=
diff --git a/modules/modperl/Makefile.inc b/modules/modperl/Makefile.inc
index abc938ce..303ef387 100644
--- a/modules/modperl/Makefile.inc
+++ b/modules/modperl/Makefile.inc
@@ -44,7 +44,7 @@ modperl_all: modperl/ZNC.$(PERLCEXT_EXT) modperl/swigperlrun.h modperl/functions
 
 modperl/ZNC.$(PERLCEXT_EXT): modperl/ZNC.o Makefile modperl.so
 	$(E) Linking ZNC Perl bindings library...
-	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PERL_LD) $(PERLDEPONMOD)
+	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PERL_LD) $(PERLDEPONMOD) $(LIBS)
 
 modperl/ZNC.o: modperl/ZNC.cpp Makefile
 	@mkdir -p modperl
diff --git a/modules/modpython/Makefile.inc b/modules/modpython/Makefile.inc
index c0cde99f..e41758ea 100644
--- a/modules/modpython/Makefile.inc
+++ b/modules/modpython/Makefile.inc
@@ -52,7 +52,7 @@ modpython/_znc_core.o: modpython/_znc_core.cpp Makefile
 
 modpython/_znc_core.$(PYCEXT_EXT): modpython/_znc_core.o Makefile modpython.so
 	$(E) Linking ZNC python bindings library...
-	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PY_LDFLAGS) $(PYDEPONMOD)
+	$(Q)$(CXX) $(MODFLAGS) $(LDFLAGS) $(MODLINK) -o $@ $< $(PY_LDFLAGS) $(PYDEPONMOD) $(LIBS)
 
 ifneq "$(SWIG)" ""
 include $(srcdir)/modpython/Makefile.gen
diff --git a/znc-buildmod.in b/znc-buildmod.in
index 55ac5251..6202e303 100755
--- a/znc-buildmod.in
+++ b/znc-buildmod.in
@@ -30,22 +30,19 @@ if test -z "$1"; then
 fi
 
 CXXFLAGS="@CPPFLAGS@ @MODFLAGS@ -I@prefix@/include $CXXFLAGS"
+LIBS="@LIBS@ $LIBS"
 MODLINK="@MODLINK@ $MODLINK"
 VERSION="@PACKAGE_VERSION@"
 
 # Ugly cygwin stuff :(
-LIBZNC="@LIBZNC@"
-LIBZNCDIR="@LIBZNCDIR@"
-LIBZNC_VERSION="@LIBZNC_VERSION@"
-if test "x" = "x$LIBZNC"; then
-    LIBZNCFLAGS=""
-else
-    LIBZNCFLAGS="-L$LIBZNCDIR -lznc-$LIBZNC_VERSION"
+if test -n "@LIBZNC@"; then
+	prefix="@prefix@"
+	exec_prefix="@exec_prefix@"
+	LDFLAGS="-L@libdir@ $LDFLAGS"
+	LIBS="-lznc $LIBS"
 fi
 
-LDFLAGS="$LIBZNCFLAGS $LDFLAGS"
-
-while test ! -z "$1"
+while test -n "$1"
 do
 	FILE=$1
 	shift
diff --git a/znc-uninstalled.pc.in b/znc-uninstalled.pc.in
index 73570abb..ae9871bb 100644
--- a/znc-uninstalled.pc.in
+++ b/znc-uninstalled.pc.in
@@ -3,6 +3,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 bindir=@bindir@
+libdir=@libdir@
 datadir=@datadir@
 includedir=@includedir@
 
diff --git a/znc.pc.in b/znc.pc.in
index c4588bea..2f5b415e 100644
--- a/znc.pc.in
+++ b/znc.pc.in
@@ -3,6 +3,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
 bindir=@bindir@
+libdir=@libdir@
 datadir=@datadir@
 includedir=@includedir@