diff --git a/debian/changelog b/debian/changelog
index 89bddc54..1f89dd5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+livecd-rootfs (2.425) yakkety; urgency=medium
+
+  * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary,
+    500-create-xdg-wrapper.binary, 700-classic-dir.binary:
+    - Correct some syntax errors in the ubuntu-core snap hooks.
+    - Create a desktop entry and some mimetype associations for xdg-open in
+      ubuntu-core. That way interacting with web, email and documentations 
+      urls in a snap should do the right thing.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 17 Aug 2016 12:11:19 +0200
+
 livecd-rootfs (2.424) yakkety; urgency=medium
 
   * Install nplan in the ubuntu-core image.
diff --git a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
index 94e88a1f..b3b0404e 100644
--- a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
+++ b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
@@ -9,7 +9,6 @@ PREFIX=binary/boot/filesystem.dir
 mkdir -p $PREFIX/usr/local/bin
 cat >$PREFIX/usr/local/bin/no-apt <<EOF
 #!/bin/sh
-cat <<EOF
 Ubuntu Core does not use apt-get, see 'snappy --help'!
 EOF
 chmod 755 $PREFIX/usr/local/bin/no-apt
diff --git a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
index f6b480fe..2f8c9570 100755
--- a/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
+++ b/live-build/ubuntu-core/hooks/500-create-xdg-wrapper.binary
@@ -9,8 +9,32 @@ PREFIX=binary/boot/filesystem.dir
 mkdir -p $PREFIX/usr/local/bin
 cat >$PREFIX/usr/local/bin/xdg-open <<EOF
 #!/bin/sh
-cat <<'EOF'
-dbus-send --print-reply --session --dest=com.canonical.SafeLauncher / com.canonical.SafeLauncher.OpenURL string:"$1"
+dbus-send --print-reply --session --dest=com.canonical.SafeLauncher / com.canonical.SafeLauncher.OpenURL string:"\$1"
 EOF
 chmod 755 $PREFIX/usr/local/bin/xdg-open
 
+# corresponding .desktop entry, needed for mimetype registration
+mkdir -p $PREFIX/usr/local/share/applications
+cat >$PREFIX/usr/local/share/applications/xdg-open.desktop <<EOF
+[Desktop Entry]
+Version=1.0
+Name=Url Handler Script
+Exec=/usr/local/bin/xdg-open %u
+MimeType=x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/mailto;x-scheme-handler/help;
+Type=Application
+EOF
+
+# define xdg-open as the default handler for common types
+cat >$PREFIX/usr/local/share/applications/mimeapps.list <<EOF
+[Added Associations]
+x-scheme-handler/http=xdg-open.desktop
+x-scheme-handler/https=xdg-open.desktop
+x-scheme-handler/mailto=xdg-open.desktop
+x-scheme-handler/help=xdg-open.desktop
+
+[Default Applications]
+x-scheme-handler/http=xdg-open.desktop
+x-scheme-handler/https=xdg-open.desktop
+x-scheme-handler/mailto=xdg-open.desktop
+x-scheme-handler/help=xdg-open.desktop
+EOF
diff --git a/live-build/ubuntu-core/hooks/700-classic-dir.binary b/live-build/ubuntu-core/hooks/700-classic-dir.binary
index 3f8cadbe..334def66 100755
--- a/live-build/ubuntu-core/hooks/700-classic-dir.binary
+++ b/live-build/ubuntu-core/hooks/700-classic-dir.binary
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# removing debian packaging artifacts
+# create hostfs entry
 
 set -ex