diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 285031aaca525e..523c065368f61c 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -3,20 +3,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "inetutils-1.9.4";
+  pname = "inetutils";
+  version = "2.0";
 
   src = fetchurl {
-    url = "mirror://gnu/inetutils/${name}.tar.gz";
-    sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
+    url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI=";
   };
 
   outputs = ["out" "apparmor"];
 
   patches = [
-    ./whois-Update-Canadian-TLD-server.patch
-    ./service-name.patch
     # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
     ./inetutils-1_9-PATH_PROCNET_DEV.patch
+    ./whois-Update-ORG-TLD-server.patch
+    ./whois-Update-Indian-TLD-server.patch
   ];
 
   nativeBuildInputs = [ help2man perl /* for `whois' */ ];
diff --git a/pkgs/tools/networking/inetutils/service-name.patch b/pkgs/tools/networking/inetutils/service-name.patch
deleted file mode 100644
index e34516313c57a8..00000000000000
--- a/pkgs/tools/networking/inetutils/service-name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inetutils-1.9.4.org/whois/whois.c	2015-03-31 17:40:50.000000000 +0200
-+++ inetutils-1.9.4/whois/whois.c	2017-04-20 10:23:38.487358708 +0200
-@@ -576,7 +576,7 @@
-   hints.ai_family = AF_UNSPEC;
-   hints.ai_socktype = SOCK_STREAM;
- 
--  if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0)
-+  if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0)
-     err_quit ("getaddrinfo: %s", gai_strerror (i));
- 
-   for (ressave = res; res; res = res->ai_next)
diff --git a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
deleted file mode 100644
index d63d4e29daf001..00000000000000
--- a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001
-From: Mats Erik Andersson <gnu@gisladisker.se>
-Date: Thu, 2 Mar 2017 15:38:38 +0100
-Subject: [PATCH] whois: Update Canadian TLD server.
-Content-Type: text/plain; charset=utf-8
-
----
- ChangeLog           | 8 ++++++++ (OMITTED)
- whois/tld_serv_list | 2 +-
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/whois/tld_serv_list b/whois/tld_serv_list
-index 056efcf..91697b8 100644
---- a/whois/tld_serv_list
-+++ b/whois/tld_serv_list
-@@ -81,7 +81,7 @@
- #.bw			# NIC? www.botsnet.bw
- #.by	NONE		# NIC? http://unibel.by www.open.by
- .bz	NONE		# http://www.psg.com/dns/bz/
--.ca	whois.cdnnet.ca
-+.ca	whois.cira.ca
- .cc	whois.nic.cc
- .cd	WEB http://www.nic.cd/database/cd/
- #.cf	NONE		# NIC? http://www.socatel.intnet.cf
--- 
-2.10.0
-
diff --git a/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch
new file mode 100644
index 00000000000000..969b24436fb606
--- /dev/null
+++ b/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch
@@ -0,0 +1,25 @@
+From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001
+From: Ashish SHUKLA <ashish.is@lostca.se>
+Date: Sun, 25 Apr 2021 08:17:52 +0530
+Subject: [PATCH] whois: Update whois server for .IN
+
+---
+ whois/tld_serv_list | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/whois/tld_serv_list b/whois/tld_serv_list
+index d9257f36..41083c18 100644
+--- a/whois/tld_serv_list
++++ b/whois/tld_serv_list
+@@ -151,7 +151,7 @@
+ .ie	whois.domainregistry.ie
+ .il	whois.isoc.org.il
+ .im	whois.nic.im
+-.in	whois.inregistry.net
++.in	whois.registry.in
+ .io	whois.nic.io
+ #.iq			# NIC?
+ .ir	whois.nic.ir
+-- 
+2.31.1
+
diff --git a/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch
new file mode 100644
index 00000000000000..dd45ec6ebf7f78
--- /dev/null
+++ b/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch
@@ -0,0 +1,38 @@
+From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001
+From: Ashish SHUKLA <ashish.is@lostca.se>
+Date: Sun, 25 Apr 2021 08:07:52 +0530
+Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore
+
+See https://www.iana.org/domains/root/db/org.html
+---
+ whois/data.h        | 1 -
+ whois/tld_serv_list | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/whois/data.h b/whois/data.h
+index d1eb10ad..82e22b6f 100644
+--- a/whois/data.h
++++ b/whois/data.h
+@@ -68,7 +68,6 @@ const char *rwhois_servers[] = {
+ const char *gtlds[] = {
+   ".com",
+   ".net",
+-  ".org",
+   ".edu",
+   NULL
+ };
+diff --git a/whois/tld_serv_list b/whois/tld_serv_list
+index ad7b9826..d9257f36 100644
+--- a/whois/tld_serv_list
++++ b/whois/tld_serv_list
+@@ -219,6 +219,7 @@
+ .nu	whois.nic.nu
+ .nz	whois.srs.net.nz
+ #.om	NONE		# NIC? http://www.gto.net.om
++.org	whois.pir.org
+ .pa	WEB http://www.nic.pa
+ #.pe	whois.rcp.net.pe	# kero.yachay.pe valid 2011-03-10
+ .pe	kero.yachay.pe
+-- 
+2.31.1
+