diff --git a/ChangeLog b/ChangeLog
index 07dc77306d..0ed1cf361d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-08  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #18643]
+	* sysdeps/unix/sysv/linux/bits/in.h: Define IPV6_RECVPATHMTU,
+	IPV6_PATHMTU, and IPV6_DONTFRAG.
+
 2015-07-08  Feng Gao  <gfree.wind@gmail.com>
 
 	* libio/fileops.c: Use "|" instead of "+" when combine _IO_LINE_BUF
@@ -20,7 +26,7 @@
 	(getpwnam_r): Likewise.
 	(fgetpwent_r): Likewise.
 
-2015-06-18  Carlos O'Donell  <carlos@redhat.com>
+2015-07-08  Carlos O'Donell  <carlos@redhat.com>
 
 	[BZ #18557]
 	* inet/rcmd.c (__validuser2_sa): Check user first to
diff --git a/NEWS b/NEWS
index 39d3140bca..23388ae9a6 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@ Version 2.22
   18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532, 18533, 18534,
   18536, 18539, 18540, 18542, 18544, 18545, 18546, 18547, 18549, 18553,
   18557, 18558, 18569, 18583, 18585, 18586, 18592, 18593, 18594, 18602,
-  18612, 18613, 18619, 18633, 18641.
+  18612, 18613, 18619, 18633, 18641, 18643.
 
 * Cache information can be queried via sysconf() function on s390 e.g. with
   _SC_LEVEL1_ICACHE_SIZE as argument.
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index f684736ee8..887719fb15 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -184,6 +184,7 @@ struct in_pktinfo
 #define IPV6_IPSEC_POLICY	34
 #define IPV6_XFRM_POLICY	35
 
+/* Advanced API (RFC3542) (1).  */
 #define IPV6_RECVPKTINFO	49
 #define IPV6_PKTINFO		50
 #define IPV6_RECVHOPLIMIT	51
@@ -195,7 +196,11 @@ struct in_pktinfo
 #define IPV6_RTHDR		57
 #define IPV6_RECVDSTOPTS	58
 #define IPV6_DSTOPTS		59
+#define IPV6_RECVPATHMTU	60
+#define IPV6_PATHMTU		61
+#define IPV6_DONTFRAG		62
 
+/* Advanced API (RFC3542) (2).  */
 #define IPV6_RECVTCLASS		66
 #define IPV6_TCLASS		67