diff --git a/gio/Makefile.am b/gio/Makefile.am
index 7c07010f1..1b1b98882 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -721,11 +721,11 @@ gdbus_LDADD = libgio-2.0.la \
 	$(top_builddir)/glib/libglib-2.0.la 		\
 	$(top_builddir)/gobject/libgobject-2.0.la
 
-completiondir = $(sysconfdir)/bash_completion.d
+completiondir = $(datadir)/bash-completion/completions
 completion_DATA = \
-	gdbus-bash-completion.sh		\
-	gsettings-bash-completion.sh		\
-	gresource-bash-completion.sh
+	completion/gdbus				\
+	completion/gsettings				\
+	completion/gresource
 EXTRA_DIST += $(completion_DATA)
 
 # ------------------------------------------------------------------------
diff --git a/gio/gdbus-bash-completion.sh b/gio/completion/gdbus
similarity index 100%
rename from gio/gdbus-bash-completion.sh
rename to gio/completion/gdbus
diff --git a/gio/gresource-bash-completion.sh b/gio/completion/gresource
similarity index 100%
rename from gio/gresource-bash-completion.sh
rename to gio/completion/gresource
diff --git a/gio/gsettings-bash-completion.sh b/gio/completion/gsettings
similarity index 100%
rename from gio/gsettings-bash-completion.sh
rename to gio/completion/gsettings