diff --git a/README.md b/README.md
index 8165024..27e21ec 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,11 @@ $ N2N_KEY=encryptme sudo ./edge -d n2n0 -c mynetwork -u 99 -g 99 -m 3C:A0:12:34:
 
 By defaul the edge will run in background but you can use the `-f` option to keep it in foreground.
 
+Windows
+-------
+
+Check out doc/windows for compilation and run istuctions.
+
 Note that `-d`, `-u`, `-g` and `-f` options are not available for Windows.
 
 Supernode
diff --git a/doc/windows b/doc/windows
new file mode 100644
index 0000000..7c40272
--- /dev/null
+++ b/doc/windows
@@ -0,0 +1,39 @@
+# Requirements
+
+In order to build on Windows the following tools should be installed:
+
+  - Visual Studio. For a minimal install, the command line only build tools can be
+    downloaded and installed from https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2017
+
+  - Cmake
+
+  - (optional) The OpenSSL library. Prebuild binaries can be downloaded from https://slproweb.com/products/Win32OpenSSL.html .
+    The full version is required (not the "Light" version).
+
+    IMPORTANT: in order to skip OpenSSL compilation, edit CMakeLists.txt and replace
+      OPTION(N2N_OPTION_AES "USE AES" ON)
+    with
+      OPTION(N2N_OPTION_AES "USE AES" OFF)
+
+In order to run n2n:
+
+  - The TAP drivers should be installed into the system. They can be installed from
+    http://build.openvpn.net/downloads/releases (search for "tap-windows")
+
+  - If OpenSSL has been compiled, the corresponding .dll file should be available
+    into the target computer
+
+# Build (CLI)
+
+In order to build from the command line, open a terminal window and run the following commands:
+
+```
+md build
+cd build
+cmake ..
+
+MSBuild edge.vcxproj /t:Build /p:Configuration=Release
+MSBuild supernode.vcxproj /t:Build /p:Configuration=Release
+```
+
+The compiled exe files should now be available under the Release directory.
diff --git a/sn.c b/sn.c
index b859c82..63b54d2 100644
--- a/sn.c
+++ b/sn.c
@@ -926,8 +926,6 @@ int main(int argc, char * const argv[]) {
 
 #ifndef WIN32
   signal(SIGHUP, dump_registrations);
-#else
-  signal(SIGINT, dump_registrations);
 #endif
   
   return run_loop(&sss_node);