diff --git a/ChangeLog b/ChangeLog
index b6fb42eb..5fafa768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
 # ChangeLog for eix - Ebuild IndeX for portage
 
+*eix-0.33.11
+	Martin Väth <martin at mvath.de>:
+	- Bugfix: Fix typo in --with-portdir-default
+	- Bugfix: Fix version for meson
+	- Remove those sanitizers which cause linking problems on my systems
+
 *eix-0.33.10
 	Martin Väth <martin at mvath.de>:
-	- Add --portdir-default with default /var/db/repos/gentoo, replacing
-	  fallback /usr/portage, see https://github.com/vaeth/eix/issues/69
+	- Add --with-portdir-default with default /var/db/repos/gentoo,
+	  replacing the previously hardcoded fallback /usr/portage,
+	  see https://github.com/vaeth/eix/issues/69
 
 *eix-0.33.9
 	Martin Väth <martin at mvath.de>:
diff --git a/configure.ac b/configure.ac
index 45c813cd..b4be32cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ dnl    each item is listed in a separate line with indent level increased;
 dnl    in such a case the opening/closing braces are isolated.
 dnl 2. The AC_INIT macro must be in one line since it is parsed by
 dnl    primitive scripts.
-AC_INIT([eix], [0.33.10], [https://github.com/vaeth/eix/issues/], [eix], [https://github.com/vaeth/eix/])
+AC_INIT([eix], [0.33.11], [https://github.com/vaeth/eix/issues/], [eix], [https://github.com/vaeth/eix/])
 AC_PREREQ([2.64])
 
 m4_ifdef([AC_CONFIG_MACRO_DIR],
@@ -280,6 +280,8 @@ AS_IF([$new_dialect],
 	[AS_CASE([" $CXXFLAGS $my_cxxadd"],
 		[*" -std="*], [],
 		[MV_ADDFLAGS([my_cxxadd], [CXXFLAGS], [MV_RUN_IFELSE_LINK], [ \
+				-std=gnu++20 \
+				-std=c++20 \
 				-std=gnu++2a \
 				-std=c++2a \
 				-std=gnu++17 \
@@ -639,26 +641,26 @@ AS_IF([$strong_security],
 	# since on some systems it requires also linking with a library.
 	[AS_VAR_SET([my_sanitize], ["
 			-faddress-sanitizer
-			-fsanitize=address
-			-fsanitize=leak
 			-fsanitize=undefined
 			-fsanitize=vla-bound
-			-fsanitize=shift
-			-fsanitize=signed-integer-overflow
-			-fsanitize=integer-divide-by-zero
 			-fsanitize=unreachable
 			-fsanitize=null
 			-fsanitize=return
 			-fsanitize=float-divide-by-zero
-			-fsanitize=float-cast-overflow
 			-fsanitize=bounds
 			-fsanitize=bounds-strict
 			-fsanitize=alignment
-			-fsanitize=object-size
 			-fsanitize=pointer-compare
 			-fsanitize=pointer-subtract
 		"])
 	# The following -fsanitize do not work properly
+	# -fsanitize=address
+	# -fsanitize=leak
+	# -fsanitize=shift
+	# -fsanitize=signed-integer-overflow
+	# -fsanitize=integer-divide-by-zero
+	# -fsanitize=float-cast-overflow
+	# -fsanitize=object-size
 	# -fsanitize=threads
 	# -fsanitize=vptr
 	# The following are no longer supported with gcc-9.0
@@ -1605,8 +1607,8 @@ AC_DEFINE_UNQUOTED([PORTDIR_CACHE_METHOD],
 AC_SUBST([PORTDIR_CACHE_METHOD])
 
 AC_MSG_CHECKING([PORTDIR default])
-AC_ARG_WITH([eprefix-default],
-	[AS_HELP_STRING([--with-eprefix-default=STR],
+AC_ARG_WITH([portdir-default],
+	[AS_HELP_STRING([--with-portdir-default=STR],
 		[default PORTDIR])],
 	[AS_VAR_COPY([PORTDIR_DEFAULT], [withval])],
 	[AS_VAR_SET([PORTDIR_DEFAULT], ["/var/db/repos/gentoo"])])
diff --git a/contrib/release.sh b/contrib/release.sh
index 2be38fe0..90f731e3 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -60,6 +60,8 @@ test -f "contrib/$name" || {
 test -f "contrib/$name" || Die 'must be run from the main directory'
 
 ver=`sed -ne 's/^[[:space:]]*AC_INIT[[:space:]]*([^,]*,[[:space:][]*\([^],[:space:]]*\).*$/\1/p' configure.ac`
+meson_ver=`sed -ne 's/^[[:space:]]*version[[:space:]]*:[[:space:]]*["'\'']\([^"'\'']*\).*$/\1/p' meson.build`
+[ "$ver" = "$meson_ver" ] || Die "Version $ver and meson version $meson_ver do not match"
 v=v$ver
 
 check=`git tag -l "$v"` || Die "git tag -l $v failed"
diff --git a/meson.build b/meson.build
index 1cec9e90..150c2bc5 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('eix', 'cpp',
-	version : '0.33.8',
+	version : '0.33.11',
 	license : 'GPLv2',
 	default_options : [
 		'prefix=/usr',
@@ -227,6 +227,8 @@ flags_dialect = []
 dialect = 'false'
 if new_dialect
 	foreach d : [
+		'gnu++20',
+		'c++20',
 		'gnu++2a',
 		'c++2a',
 		'gnu++17',
@@ -544,24 +546,24 @@ endif
 if strong_security
 	ldcxxflags_opt += [
 		[ '-faddress-sanitizer' ],
-		[ '-fsanitize=address' ],
-		[ '-fsanitize=leak' ],
 		[ '-fsanitize=undefined' ],
 		[ '-fsanitize=vla-bound' ],
-		[ '-fsanitize=shift' ],
-		[ '-fsanitize=signed-integer-overflow' ],
-		[ '-fsanitize=integer-divide-by-zero' ],
 		[ '-fsanitize=unreachable' ],
 		[ '-fsanitize=null' ],
 		[ '-fsanitize=return' ],
 		[ '-fsanitize=float-divide-by-zero' ],
-		[ '-fsanitize=float-cast-overflow' ],
 		[ '-fsanitize=bounds' ],
 		[ '-fsanitize=bounds-strict' ],
 		[ '-fsanitize=alignment' ],
-		[ '-fsanitize=object-size' ],
 		[ '-fsanitize=pointer-compare' ],
 		[ '-fsanitize=pointer-subtract' ],
+		# [ '-fsanitize=address' ],
+		# [ '-fsanitize=leak' ],
+		# [ '-fsanitize=shift' ],
+		# [ '-fsanitize=signed-integer-overflow' ],
+		# [ '-fsanitize=integer-divide-by-zero' ],
+		# [ '-fsanitize=float-cast-overflow' ],
+		# [ '-fsanitize=object-size' ],
 		# [ '-fsanitize=threads' ],
 		# [ '-fsanitize=vptr' ],
 		# [ '-mmpx' ],