diff --git a/codecs/Makefile b/codecs/Makefile
index a09f67149e..3fcfd88b1c 100644
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -56,3 +56,4 @@ $(LIBG722):
 $(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
 
 codec_resample.o: ASTCFLAGS+=-I$(ASTTOPDIR)/main/libresample/include
+codec_resample.so: LIBS += $(ASTTOPDIR)/main/libresample/libresample.a
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index ce0d60a515..66d60169d9 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -29,7 +29,7 @@
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 /* These are for SHRT_MAX and FLT_MAX -- { */
-#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) 
+#if defined(__Darwin__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__CYGWIN__)
 #include <float.h>
 #else
 #include <values.h>