diff --git a/Makefile b/Makefile
index 06fbd50..bc74ab5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,12 @@ GIT_SUBMODULE_UPDATE := git submodule update --init --recursive
 
 else # "variables.mk" was included. Business as usual until the end of this file.
 
+# Determine the OS
+detected_OS := $(shell uname -s)
+ifneq (,$(findstring MINGW,$(detected_OS)))
+  detected_OS := Windows
+endif
+
 ##########
 ## Main ##
 ##########
@@ -61,10 +67,17 @@ NIM_PARAMS := $(NIM_PARAMS) -d:git_version=\"$(GIT_VERSION)\"
 ##################
 .PHONY: build-waku-librln
 
+LIBRLN_VERSION := v0.7.0
+ifeq ($(detected_OS),Windows)
+LIBRLN_FILE := rln.lib
+else
+LIBRLN_FILE := librln_$(LIBRLN_VERSION).a
+endif
+
 build-waku-librln:
 	@echo "Start building waku librln"
 	$(MAKE) -C vendor/nwaku librln
-	$(eval NIM_PARAMS += --passL:./vendor/nwaku/librln_v0.9.0.a --passL:-lm)
+	$(eval NIM_PARAMS += --passL:$(LIBRLN_FILE) --passL:-lm)
 	@echo "Completed building librln"
 
 build-waku-nat:
diff --git a/vendor/nwaku b/vendor/nwaku
index 2d40cb9..41146a9 160000
--- a/vendor/nwaku
+++ b/vendor/nwaku
@@ -1 +1 @@
-Subproject commit 2d40cb9d62ba24eac9f58da1be3a3c6eb4357253
+Subproject commit 41146a9193c1e360b9a0049d672260a72c4ca2bf