diff --git a/debian/gemian-system.install b/debian/gemian-system.install
new file mode 100644
index 0000000..3312b77
--- /dev/null
+++ b/debian/gemian-system.install
@@ -0,0 +1 @@
+udev/rules.d/* /usr/lib/gemian/udev-rules/
diff --git a/debian/postinst b/debian/postinst
index 9ba5ab8..f23e2ca 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,21 +8,30 @@ if [ "$action" != configure ]; then
 fi
 
 cmdline=$(</proc/cmdline)
+device="unknown"
+android_system_dir="unknown"
 android_system_img="unknown"
 target_checksum="unknown"
 
 if [[ "$cmdline" =~ ^(.*)androidboot.hardware\=mt6797(.*)$ ]];
 then
+  device="mt6797"
+  android_system_dir="/data"
   android_system_img="/data/system.img"
   target_checksum="39cd17718e838823c80be0ddfc9763d88e32c1b0"
 fi
 
 if [[ "$cmdline" =~ ^(.*)androidboot.hardware\=mt6771(.*)$ ]];
 then
+  device="mt6771"
+  android_system_dir="/var/lib/lxc/android"
   android_system_img="/var/lib/lxc/android/android-rootfs.img"
   target_checksum="4478ce425e593fb708b86234a8ea83e6fcdaaeec"
 fi
 
+[ -e /lib/udev/rules.d/80-keyboard.rules ] || \
+    cp /usr/lib/gemian/udev-rules/80-keyboard-$device.rules /lib/udev/rules.d/80-keyboard.rules
+
 echo "Target checksum $target_checksum"
 
 echo "Checking $android_system_img"
@@ -45,6 +54,7 @@ else
   if [ "$target_checksum" == "$downloaded_checksum" ];
   then
     echo "Moving new system image into place, please reboot to activate"
+    mkdir -p $android_system_dir
     mv $tempfile $android_system_img
     exit 0
   else
diff --git a/debian/rules b/debian/rules
index b813074..cd7c777 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,34 +1,7 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
-# keep lintian happy:
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep:
-
-build-stamp:
-
-clean: checkdir
-
-binary-arch:
-
-binary-indep:
-	-rm -rf debian/tmp
-	install -p -d -o root -g root -m 755 debian/tmp
-	install -p -d -o root -g root -m 755 debian/tmp/DEBIAN
-	install -p    -o root -g root -m 755 debian/postinst debian/tmp/DEBIAN/
-	dpkg-gencontrol
-	dpkg --build debian/tmp ..
-
-binary:         binary-arch binary-indep
-
-checkdir:
-	@test -f debian/rules
-
-checkroot: checkdir
-	@test 0 = `id -u` || { echo "Error: not super-user"; exit 1; }
-
-.PHONY: binary binary-arch binary-indep clean checkroot checkdir build build-arch build-indep
+%:
+	dh $@
diff --git a/udev/rules.d/80-keyboard-mt6771.rules b/udev/rules.d/80-keyboard-mt6771.rules
new file mode 100644
index 0000000..b2da74e
--- /dev/null
+++ b/udev/rules.d/80-keyboard-mt6771.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="input", ATTRS{name}=="Integrated keyboard", ENV{XKBMODEL}="planetcosmo"
diff --git a/udev/rules.d/80-keyboard-mt6797.rules b/udev/rules.d/80-keyboard-mt6797.rules
new file mode 100644
index 0000000..b4e05e0
--- /dev/null
+++ b/udev/rules.d/80-keyboard-mt6797.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="input", ATTRS{name}=="Integrated keyboard", ENV{XKBMODEL}="planetgemini"