libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 7 ++++++-
 libxfce4ui/xfce-screensaver.c                    | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
index 32901e3..ce471c3 100644
--- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
+++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml
@@ -12,6 +12,8 @@
       </property>
       <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
       <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
+      <property name="&lt;Primary&gt;Escape" type="string" value="xfce4-popup-menu"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;L" type="string" value="xfce4-session-logout"/>
       <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
       <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
       <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
@@ -19,7 +21,10 @@
       <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
       <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
       <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
-      <property name="Print" type="string" value="xfce4-screenshooter"/>
+      <property name="XF86AudioRaiseVolume" type="string" value="amixer set Master 10%+ -q"/>
+      <property name="XF86AudioLowerVolume" type="string" value="amixer set Master 10%- -q"/>
+      <property name="XF86AudioMute" type="string" value="amixer set Master toggle -q"/>
+      <property name="Print" type="string" value="xfce4-screenshooter -f"/>
       <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
       <property name="&lt;Shift&gt;Print" type="string" value="xfce4-screenshooter -r"/>
       <property name="&lt;Super&gt;e" type="string" value="thunar"/>
diff --git a/libxfce4ui/xfce-screensaver.c b/libxfce4ui/xfce-screensaver.c
index d2acc07..4983396 100644
--- a/libxfce4ui/xfce-screensaver.c
+++ b/libxfce4ui/xfce-screensaver.c
@@ -674,5 +674,9 @@ xfce_screensaver_lock (XfceScreensaver *saver)
       && g_spawn_check_exit_status (status, NULL))
     return TRUE;
 
+  if (g_spawn_command_line_sync ("xflock4", NULL, NULL, &status, NULL)
+      && g_spawn_check_exit_status (status, NULL))
+    return TRUE;
+
   return FALSE;
 }