diff --git a/libc-test/build.rs b/libc-test/build.rs
index 9b4527e..a4c493f 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -141,8 +141,6 @@
                     s => s.to_string(),
                 }
             }
-            // Perhaps this should be renamed in libc...
-            "ip6_mreq" => "struct ipv6_mreq".to_string(),
 
             // Just pass all these through, no need for a "struct" prefix
             "glob_t" |
diff --git a/src/lib.rs b/src/lib.rs
index fc2e6c2..c6b5bd1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -347,7 +347,7 @@
                     pub imr_interface: in_addr,
                 }
                 #[repr(C)]
-                #[derive(Copy, Clone)] pub struct ip6_mreq {
+                #[derive(Copy, Clone)] pub struct ipv6_mreq {
                     pub ipv6mr_multiaddr: in6_addr,
                     pub ipv6mr_interface: c_uint,
                 }
@@ -912,7 +912,7 @@
                     pub imr_interface: in_addr,
                 }
                 #[repr(C)]
-                #[derive(Copy, Clone)] pub struct ip6_mreq {
+                #[derive(Copy, Clone)] pub struct ipv6_mreq {
                     pub ipv6mr_multiaddr: in6_addr,
                     pub ipv6mr_interface: c_uint,
                 }
@@ -1274,7 +1274,7 @@
                     pub imr_interface: in_addr,
                 }
                 #[repr(C)]
-                #[derive(Copy, Clone)] pub struct ip6_mreq {
+                #[derive(Copy, Clone)] pub struct ipv6_mreq {
                     pub ipv6mr_multiaddr: in6_addr,
                     pub ipv6mr_interface: c_uint,
                 }
@@ -1561,7 +1561,7 @@
                     pub imr_interface: in_addr,
                 }
                 #[repr(C)]
-                #[derive(Copy, Clone)] pub struct ip6_mreq {
+                #[derive(Copy, Clone)] pub struct ipv6_mreq {
                     pub ipv6mr_multiaddr: in6_addr,
                     pub ipv6mr_interface: c_uint,
                 }
@@ -1788,7 +1788,7 @@
                     pub imr_interface: in_addr,
                 }
                 #[repr(C)]
-                #[derive(Copy, Clone)] pub struct ip6_mreq {
+                #[derive(Copy, Clone)] pub struct ipv6_mreq {
                     pub ipv6mr_multiaddr: in6_addr,
                     pub ipv6mr_interface: c_uint,
                 }
@@ -2233,7 +2233,7 @@
                 }
 
                 #[repr(C)]
-                #[derive(Copy, Clone)] pub struct ip6_mreq {
+                #[derive(Copy, Clone)] pub struct ipv6_mreq {
                     pub ipv6mr_multiaddr: in6_addr,
                     pub ipv6mr_interface: c_uint,
                 }