diff --git a/lib/languages b/lib/languages
index dce015776d..94c0189ad3 100644
--- a/lib/languages
+++ b/lib/languages
@@ -170,6 +170,9 @@ Language basque
 	PolyglossiaName  basque
 	Encoding         iso8859-15
 	LangCode         eu_ES
+	PostBabelPreamble
+	\addto\extrasbasque{\bbl@deactivate{~}}
+	EndPostBabelPreamble
 End
 
 Language belarusian
@@ -326,6 +329,9 @@ Language estonian
 	PolyglossiaName  estonian
 	Encoding         iso8859-15
 	LangCode         et_EE
+	PostBabelPreamble
+	\addto\extrasestonian{\bbl@deactivate{~}}
+	EndPostBabelPreamble
 End
 
 # the preamble definitions are only used due to bugs in the
@@ -372,6 +378,9 @@ Language galician
 	PolyglossiaName  galician
 	Encoding         iso8859-15
 	LangCode         gl_ES
+	PostBabelPreamble
+	\addto\shorthandsgalician{\galiciandeactivate{~}}
+	EndPostBabelPreamble
 End
 
 # german does not use a country code (due to the variety)
diff --git a/status.20x b/status.20x
index 421cacd061..9b4a121465 100644
--- a/status.20x
+++ b/status.20x
@@ -84,6 +84,8 @@ What's new
 
 - Write correct DTD for MathML (bug #8160).
 
+- Make the ~ char in Basque, Estonian and Galician non-active (bug #8265).
+
 - Embrace babel settings to \makeatletter ... \makeatother if they contain
   an @ glyph.