diff --git a/znc-buildmod.in b/znc-buildmod.in
index e5f2aa1a..b8fa2301 100755
--- a/znc-buildmod.in
+++ b/znc-buildmod.in
@@ -45,6 +45,7 @@ fi
 CXXFLAGS="`${ZNC_CONFIG} --cflags` $CXXFLAGS"
 INCLUDES="`${ZNC_CONFIG} --include` $INCLUDES"
 LIBS="`${ZNC_CONFIG} --libs` $LIBS"
+LDFLAGS="`${ZNC_CONFIG} --libznc` $LDFLAGS"
 
 # Get the first word and strip away the first two chars (which is -I)
 INC_PATH=`echo ${INCLUDES} | ${SED} 's: .*::' | ${SED} 's:^..::'`
@@ -66,7 +67,7 @@ do
 		echo "${ERROR} Building ${MOD}.so... File not found"
 	else
 		printf "Building ${MOD}.so... "
-		if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LIBS} -shared -o ${MOD}.so ${FILE} ; then
+		if ${CXX} ${CXXFLAGS} ${INCLUDES} ${LDFLAGS} ${LIBS} -shared -o ${MOD}.so ${FILE} ; then
 			echo "${OK}"
 		else
 			echo "${ERROR} Error while building ${MOD}.so"
diff --git a/znc-config.in b/znc-config.in
index 0640bb86..9454e18d 100755
--- a/znc-config.in
+++ b/znc-config.in
@@ -16,6 +16,15 @@ MODDIR="@MODDIR@"
 DATADIR="@DATADIR@"
 VERSION="@PACKAGE_VERSION@"
 
+# Ugly cygwin stuff :(
+LIBZNC="@LIBZNC@"
+LIBZNCDIR="@LIBZNCDIR@"
+if test "x" = "x$LIBZNC"; then
+	LIBZNCFLAGS=""
+else
+	LIBZNCFLAGS="-L\"$LIBZNCDIR\" -lznc"
+fi
+
 if test -z "$1"; then
 	echo "USAGE: $0 <flag>"
 	echo "	--cxx        [$CXX]"
@@ -26,6 +35,7 @@ if test -z "$1"; then
 	echo "	--datadir    [$DATADIR]"
 	echo "	--version    [$VERSION]"
 	echo "	--prefix     [$prefix]"
+	echo "	--libznc     [$LIBZNCFLAGS]"
 	exit 1
 fi
 
@@ -49,6 +59,8 @@ case $1 in
 		echo $VERSION;;
 	--prefix)
 		echo $prefix;;
+	--libznc)
+		echo $LIBZNCFLAGS;;
 esac
 
 exit 0