diff --git a/gxml/meson.build b/gxml/meson.build
index 8c080be66edc119f226e0d948fc9e05fd92b250b..7d3990129c8428e73e5664f8ccd624f0c6167092 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -170,10 +170,10 @@ libgxml = library(VERSIONED_PROJECT_NAME,
 		true,
 		join_paths (get_option('includedir'), 'gxml-@0@'.format (API_VERSION), 'gxml'),
 		vapidir,
-		not get_option('disable-introspection')
+		get_option('introspection')
 	])
 
-if not get_option('disable-introspection')
+if get_option('introspection')
 g_ir_compiler = find_program('g-ir-compiler', required: false)
 if g_ir_compiler.found()
 custom_target('typelib',
diff --git a/meson.build b/meson.build
index 87b927c9b87c8e3351b13fcc5488b43677356bd8..44666e5c4c33bdfe1e194fc765e91fcdfcf9eae3 100644
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,7 @@ inc_rooth_dep = declare_dependency (include_directories : inc_rooth)
 subdir('po')
 subdir('vapi')
 subdir('gxml')
-if not get_option('disable-valadocs')
+if get_option('docs')
 subdir('docs')
 endif
 subdir('test')
diff --git a/meson_options.txt b/meson_options.txt
index b55f11f323131ca51370aea4d96ff1e958f0875e..7e9f059ea7f5126ac59b66d26f08d87a324ce81d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,3 @@
-option('enable-tnode-tests', type : 'boolean', value : false, description : 'Enable TNode classes unit tests')
-option('disable-introspection', type : 'boolean', value : true, description : 'Disable GObject Introspection')
-option('disable-valadocs', type : 'boolean', value : true, description : 'Disable Vala Documentation')
+option('tnode-tests', type : 'boolean', value : false, description : 'Add TNode classes unit tests')
+option('introspection', type : 'boolean', value : false, description : 'Create GObject Introspection file definitions')
+option('docs', type : 'boolean', value : false, description : 'Generate Vala Documentation')
diff --git a/test/meson.build b/test/meson.build
index ed62594e5c58f90c0ef18d6b34516433a36c59e5..d9636b32a6f697dd51db486e3ec852e44a0867d4 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -21,7 +21,7 @@ files_tests = files ([
 	])
 
 tests_cargs = []
-if get_option('enable-tnode-tests')
+if get_option('tnode-tests')
 files_tests += files ([
 
 	'EnumerationTest.vala',