diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index f94fbbb16..f188ca4f4 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-28  Jens Granseuer  <jensgr@gmx.net>
+
+	Based on patch by: Jakub Rusinek <liviopl.pl@gmail.com>
+
+	* gnome-default-applications.xml.in: add support for Midori web browser
+	(bug #500274)
+
 2007-11-26  Sebastien Bacher  <seb128@ubuntu.com>
 
 	* gnome-default-applications.xml.in: don't list the oudated evolution
diff --git a/capplets/default-applications/gnome-default-applications.xml.in b/capplets/default-applications/gnome-default-applications.xml.in
index f3ae50fc0..235e43827 100644
--- a/capplets/default-applications/gnome-default-applications.xml.in
+++ b/capplets/default-applications/gnome-default-applications.xml.in
@@ -139,6 +139,14 @@
       <run-in-terminal>false</run-in-terminal>
       <netscape-remote>false</netscape-remote>
     </web-browser>
+    <web-browser>
+      <_name>Midori</_name>
+      <executable>midori</executable>
+      <command>midori %s</command>
+      <icon-name>web-browser</icon-name>
+      <run-in-terminal>false</run-in-terminal>
+      <netscape-remote>false</netscape-remote>
+    </web-browser>
   </web-browsers>
 
   <mail-readers>