diff --git a/ChangeLog b/ChangeLog
index 2eee52c..450d7be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ User johns
 Date:
 
     Release Version 0.5.0
+    Enable/disable/toggle fullscreen with hot-key (Feature #930).
 
 User: CafeDelMar
 Date: Thu Apr  5 22:44:06 CEST 2012
diff --git a/softhddevice.cpp b/softhddevice.cpp
index 33540b8..a94aaa7 100644
--- a/softhddevice.cpp
+++ b/softhddevice.cpp
@@ -844,6 +844,15 @@ static void HandleHotkey(int code)
 	case 12:			// toggle pass-through
 	    CodecSetAudioPassthrough(ConfigAudioPassthrough ^= 1);
 	    break;
+	case 20:			// disable full screen
+	    VideoSetFullscreen(0);
+	    break;
+	case 21:			// enable full screen
+	    VideoSetFullscreen(1);
+	    break;
+	case 22:			// toggle full screen
+	    VideoSetFullscreen(-1);
+	    break;
 	default:
 	    esyslog(tr("[softhddev]: hot key %d is not supported\n"), code);
 	    break;
@@ -1769,7 +1778,10 @@ static const char *SVDRPHelpText[] = {
 	"    key is the hotkey number, following are supported:\n"
 	"    10: disable audio pass-through\n"
 	"    11: enable audio pass-through\n"
-	"    12: toggle audio pass-through\n",
+	"    12: toggle audio pass-through\n"
+	"    20: disable fullscreen\n"
+	"    21: enable fullscreen\n"
+	"    22: toggle fullscreen\n",
     NULL
 };