diff --git a/src/gtp-genl.c b/src/gtp-genl.c
index 3c7deed..2f33adb 100644
--- a/src/gtp-genl.c
+++ b/src/gtp-genl.c
@@ -37,7 +37,8 @@
 #include <libgtpnl/gtpnl.h>
 
 #include <net/if.h>
-#include <linux/gtp_nl.h>
+#include <linux/gtp.h>
+#include <linux/if_link.h>
 
 #include "internal.h"
 
@@ -71,7 +72,7 @@
 	}
 
 	nlh = genl_nlmsg_build_hdr(buf, genl_id, NLM_F_EXCL | NLM_F_ACK, ++seq,
-				   GTP_CMD_TUNNEL_NEW);
+				   GTP_CMD_NEWPDP);
 	gtp_build_payload(nlh, t);
 
 	if (genl_socket_talk(nl, nlh, seq, NULL, NULL) < 0)
@@ -88,7 +89,7 @@
 	uint32_t seq = time(NULL);
 
 	nlh = genl_nlmsg_build_hdr(buf, genl_id, NLM_F_ACK, ++seq,
-				   GTP_CMD_TUNNEL_DELETE);
+				   GTP_CMD_DELPDP);
 	gtp_build_payload(nlh, t);
 
 	if (genl_socket_talk(nl, nlh, seq, NULL, NULL) < 0)
@@ -188,7 +189,7 @@
 	uint32_t seq = time(NULL);
 
 	nlh = genl_nlmsg_build_hdr(buf, genl_id, NLM_F_DUMP, 0,
-				   GTP_CMD_TUNNEL_GET);
+				   GTP_CMD_GETPDP);
 
 	if (genl_socket_talk(nl, nlh, seq, genl_gtp_attr_cb, NULL) < 0) {
 		perror("genl_socket_talk");
diff --git a/src/gtp-rtnl.c b/src/gtp-rtnl.c
index 527015b..5b0bdc1 100644
--- a/src/gtp-rtnl.c
+++ b/src/gtp-rtnl.c
@@ -31,7 +31,8 @@
 #include <linux/if_link.h>
 #include <linux/rtnetlink.h>
 #include <libgtpnl/gtpnl.h>
-#include <linux/gtp_nl.h>
+#include <linux/gtp.h>
+#include <linux/if_link.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <time.h>
@@ -127,7 +128,7 @@
 	nest2 = mnl_attr_nest_start(nlh, IFLA_INFO_DATA);
 	mnl_attr_put_u32(nlh, IFLA_GTP_FD0, fd0);
 	mnl_attr_put_u32(nlh, IFLA_GTP_FD1, fd1);
-	mnl_attr_put_u32(nlh, IFLA_GTP_HASHSIZE, 131072);
+	mnl_attr_put_u32(nlh, IFLA_GTP_PDP_HASHSIZE, 131072);
 	mnl_attr_nest_end(nlh, nest2);
 	mnl_attr_nest_end(nlh, nest);