diff --git a/Daemon.cpp b/Daemon.cpp
index d34712a3..d6e37a8f 100644
--- a/Daemon.cpp
+++ b/Daemon.cpp
@@ -138,6 +138,11 @@ namespace i2p
 
 			bool ipv6;		i2p::config::GetOption("ipv6", ipv6);
 			bool ipv4;		i2p::config::GetOption("ipv4", ipv4);
+#ifdef MESHNET
+      // manual override for meshnet
+      ipv4 = false;
+      ipv6 = true;
+#endif
 			bool transit; i2p::config::GetOption("notransit", transit);
 			i2p::context.SetSupportsV6		 (ipv6);
 			i2p::context.SetSupportsV4		 (ipv4);
diff --git a/Makefile b/Makefile
index 4cc313a9..025dbbcc 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ include filelist.mk
 
 USE_AESNI  := yes
 USE_STATIC := no
+USE_MESHNET := yes
 
 ifeq ($(UNAME),Darwin)
 	DAEMON_SRC += DaemonLinux.cpp
@@ -30,6 +31,10 @@ else # win32 mingw
 	include Makefile.mingw
 endif
 
+ifeq ($(USE_MESHNET),yes)
+	CXXFLAGS += -DMESHNET
+endif
+
 all: mk_obj_dir $(ARLIB) $(ARLIB_CLIENT) $(I2PD)
 
 mk_obj_dir:
diff --git a/Reseed.cpp b/Reseed.cpp
index 722d7eff..096035da 100644
--- a/Reseed.cpp
+++ b/Reseed.cpp
@@ -20,20 +20,26 @@ namespace i2p
 {
 namespace data
 {
-	static std::vector<std::string> httpsReseedHostList = 
+	static std::vector<std::string> httpsReseedHostList =
 	{
+#ifdef MESHNET
+		// meshnet i2p reseeds
+		"https://reseed.i2p.rocks:8443/"
+#else
+		// mainline i2p reseeds
 		"https://reseed.i2p-projekt.de/", // Only HTTPS
-        "https://i2p.mooo.com/netDb/",
-        "https://netdb.i2p2.no/", // Only SU3 (v3) support, SNI required
+				"https://i2p.mooo.com/netDb/",
+				"https://netdb.i2p2.no/", // Only SU3 (v3) support, SNI required
 		"https://us.reseed.i2p2.no:444/",	
-        "https://uk.reseed.i2p2.no:444/",
+				"https://uk.reseed.i2p2.no:444/",
 		"https://i2p.manas.ca:8443/",
 		"https://i2p-0.manas.ca:8443/",
-        "https://reseed.i2p.vzaws.com:8443/", // Only SU3 (v3) support
-        "https://user.mx24.eu/", // Only HTTPS and SU3 (v3) support
-        "https://download.xxlspeed.com/" // Only HTTPS and SU3 (v3) support
+				"https://reseed.i2p.vzaws.com:8443/", // Only SU3 (v3) support
+				"https://user.mx24.eu/", // Only HTTPS and SU3 (v3) support
+				"https://download.xxlspeed.com/" // Only HTTPS and SU3 (v3) support
+#endif
 	};
-	
+ 
 	Reseeder::Reseeder()
 	{
 	}
diff --git a/version.h b/version.h
index 46d170db..54fc295f 100644
--- a/version.h
+++ b/version.h
@@ -12,7 +12,12 @@
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
 #define VERSION I2PD_VERSION
+
+#ifdef MESHNET
+#define I2PD_NET_ID 3
+#else
 #define I2PD_NET_ID 2
+#endif
 
 #define I2P_VERSION_MAJOR 0
 #define I2P_VERSION_MINOR 9