diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index a3e31808348..fd34954db6e 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="229"
-      android:versionName="0.229"
+      android:versionCode="230"
+      android:versionName="0.230"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->
diff --git a/makefile b/makefile
index 67a5a88e6f2..817a2fa29b4 100644
--- a/makefile
+++ b/makefile
@@ -1755,14 +1755,14 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.229"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.230"' > $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char build_version[];' >> $@
 	@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
 	@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.229" > $@
+	@echo #define BARE_BUILD_VERSION "0.230" > $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char build_version[]; >> $@
 	@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 6655832ac59..eb6beb565e9 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1091,6 +1091,12 @@ end
 				"-Wno-unknown-warning-option",
 				"-Wno-unused-value",
 			}
+			if (version < 70000) or ((version < 100001) and (_OPTIONS["targetos"] == 'macosx')) then
+				buildoptions { -- clang 6.0 complains that [[maybe_unused]] is ignored for static data members
+					"-Wno-error=ignored-attributes",
+					"-Wno-error=unused-const-variable",
+				}
+			end
 			if ((version >= 100000) and (_OPTIONS["targetos"] ~= 'macosx')) or (version >= 120000) then
 				buildoptions {
 					"-Wno-xor-used-as-pow", -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention