diff --git a/Makefile b/Makefile
index d072e92..c34bc5c 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,9 @@ install:
 	install -d $(DESTDIR)/usr/bin
 	ln -sf qvm-start-daemon $(DESTDIR)/usr/bin/qvm-start-gui
 	install -m 0755 scripts/qubes-guivm-session $(DESTDIR)/usr/bin/
+	install -d $(DESTDIR)/etc/qubes/post-install.d
+	install -m 0755 scripts/30-keyboard-layout-service.sh \
+		$(DESTDIR)/etc/qubes/post-install.d/30-keyboard-layout-service.sh
 
 clean:
 	rm -rf test-packages/__pycache__ qubesadmin/__pycache__
diff --git a/debian/rules b/debian/rules
index b71d910..cadd766 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,9 @@ override_dh_auto_install:
 	install -d debian/qubes-core-admin-client/usr/share/man/man1
 	install -m 0644 build/man/* \
 		debian/qubes-core-admin-client/usr/share/man/man1/
+	install -d debian/qubes-core-admin-client/etc/qubes/post-install.d
+	install -m 0755 scripts/30-keyboard-layout-service.sh \
+		debian/qubes-core-admin-client/etc/qubes/post-install.d/30-keyboard-layout-service.sh
 
 override_dh_clean:
 	dh_clean -O--buildsystem=pybuild
diff --git a/rpm_spec/qubes-core-admin-client.spec.in b/rpm_spec/qubes-core-admin-client.spec.in
index bcfd0a4..88502c4 100644
--- a/rpm_spec/qubes-core-admin-client.spec.in
+++ b/rpm_spec/qubes-core-admin-client.spec.in
@@ -67,7 +67,7 @@ make -C doc DESTDIR=$RPM_BUILD_ROOT \
 %files -n python%{python3_pkgversion}-qubesadmin
 %{python3_sitelib}/qubesadmin-*egg-info
 %{python3_sitelib}/qubesadmin
-
+/etc/qubes/post-install.d/30-keyboard-layout-service.sh
 
 %changelog
 @CHANGELOG@
diff --git a/scripts/30-keyboard-layout-service.sh b/scripts/30-keyboard-layout-service.sh
new file mode 100644
index 0000000..a24378c
--- /dev/null
+++ b/scripts/30-keyboard-layout-service.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qvm-features-request supported-feature.keyboard-layout=1