diff --git a/README b/README
index f5745e49..cb92aa1b 100644
--- a/README
+++ b/README
@@ -580,6 +580,7 @@ ALT-ENTER     Switch to full screen and back.
 ALT-PAUSE     Pause emulation.
 CTRL-F1       Start the keymapper.
 CTRL-F4       Change between mounted disk-images. Update directory cache for all drives!
+CTRL-ALT-F5   Start/Stop creating a movie of the screen.
 CTRL-F5       Save a screenshot.(png)
 CTRL-F6       Start/Stop recording sound output to a wave file.
 CTRL-ALT-F7   Start/Stop recording of OPL commands.
diff --git a/configure.in b/configure.in
index 3afe2214..4a981905 100644
--- a/configure.in
+++ b/configure.in
@@ -281,6 +281,19 @@ case "$target" in
        ;;
 esac
 
+dnl Some stuff for the icon.
+case "$target" in
+    *-*-cygwin* | *-*-mingw32*)
+       dnl Some stuff for the ico
+       AC_CHECK_TOOL(WINDRES, windres, :)
+    ;;
+    *)
+       WINDRES=":"
+    ;;
+esac
+       AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:")
+       AC_SUBST(WINDRES)
+
 
 AC_OUTPUT([ 
 Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c18bf996..2ef2a360 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,4 +8,12 @@ dosbox_SOURCES = dosbox.cpp
 dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a  hardware/libhardware.a gui/libgui.a \
                ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a \
 	       libs/zmbv/libzmbv.a
+	       
+if HAVE_WINDRES
+dosbox_LDADD += dosbox_ico.o
+endif
+
+EXTRA_DIST = dosbox.rc dosbox.ico
+dosbox_ico.o: dosbox.rc dosbox.ico
+	$(WINDRES) dosbox.rc dosbox_ico.o
 
diff --git a/src/dos/dos_programs.cpp b/src/dos/dos_programs.cpp
index cb7ed663..d678a2c5 100644
--- a/src/dos/dos_programs.cpp
+++ b/src/dos/dos_programs.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos_programs.cpp,v 1.51 2006-01-22 14:13:00 qbix79 Exp $ */
+/* $Id: dos_programs.cpp,v 1.52 2006-02-09 08:49:52 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -939,6 +939,7 @@ void DOS_SetupPrograms(void) {
 		"\033[33;1mALT-PAUSE\033[0m   : Pause DOSBox.\n"
 		"\033[33;1mCTRL-F1\033[0m     : Start the \033[33mkeymapper\033[0m.\n"
 		"\033[33;1mCTRL-F4\033[0m     : Update directory cache for all drives! Swap mounted disk-image.\n"
+		"\033[33;1mCTRL-ALT-F5\033[0m : Start/Stop creating a movie of the screen.\n"
 		"\033[33;1mCTRL-F5\033[0m     : Save a screenshot.\n"
 		"\033[33;1mCTRL-F6\033[0m     : Start/Stop recording sound output to a wave file.\n"
 		"\033[33;1mCTRL-ALT-F7\033[0m : Start/Stop recording of OPL commands.\n"
diff --git a/src/dosbox.ico b/src/dosbox.ico
new file mode 100644
index 00000000..b6fcd916
Binary files /dev/null and b/src/dosbox.ico differ
diff --git a/src/dosbox.rc b/src/dosbox.rc
new file mode 100644
index 00000000..024db97e
--- /dev/null
+++ b/src/dosbox.rc
@@ -0,0 +1 @@
+dosbox_ico ICON dosbox.ico