diff --git a/meson.build b/meson.build
index c74e6fdd6..ebe5d522d 100644
--- a/meson.build
+++ b/meson.build
@@ -209,6 +209,10 @@ elif get_option('database') == 'gdbm'
   database_dep = cc.find_library('gdbm', required : true)
 endif
 
+if get_option('ipv6')
+  cdata.set('HAVE_IPV6', 1)
+endif
+
 atomictest = '''void func() {
   volatile int atomic = 2;
   __sync_bool_compare_and_swap (&atomic, 2, 3);
diff --git a/meson_options.txt b/meson_options.txt
index b8f50ba96..767ca1968 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -53,6 +53,9 @@ option('gtk',
 option('hal-compat',
        type : 'boolean',
        description : 'Optional HAL->udev transition compatibility support (needs udev)')
+option('ipv6',
+       type : 'boolean',
+       description : 'Optional IPv6 support')
 option('jack',
        type : 'feature', value : 'auto',
        description : 'Optional JACK support')