diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 142fcff89..7242b36d7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20100821
+--------
+d1x-rebirth.ico, d1x-rebirth.xpm, arch/sdl/gr.c, arch/ogl/gr.c: Bind WM-Icon to application
+
 20100819
 --------
 d1x-rebirth/main/bmread.c, d1x-rebirth/main/paging.c, d1x-rebirth/main/aipath.c, d1x-rebirth/main/piggy.c, d1x-rebirth/main/gamesave.c, d1x-rebirth/main/dumpmine.c, d1x-rebirth/main/kconfig.c, d1x-rebirth/main/gamecntl.c, d1x-rebirth/editor/segment.c, d1x-rebirth/editor/kmine.c, d1x-rebirth/editor/mine.c, d1x-rebirth/editor/group.c, d1x-rebirth/editor/med.c, d1x-rebirth/editor/eswitch.c, d1x-rebirth/editor/medwall.c, d1x-rebirth/iff/iff.c, d1x-rebirth/ui/radio.c, d1x-rebirth/ui/scroll.c, d1x-rebirth/ui/window.c, d1x-rebirth/ui/keypad.c, d1x-rebirth/ui/file.c, d1x-rebirth/ui/listbox.c, d1x-rebirth/ui/mouse.c, d1x-rebirth/ui/menubar.c, d1x-rebirth/ui/lfile.c, d1x-rebirth/mem/mem.c: Patching together editor so it compiles again (while still not running); Implemented PhysFS for file accessing for editor- and debugging-related code
diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c
index 0868a8809..c73d7ee02 100644
--- a/arch/ogl/gr.c
+++ b/arch/ogl/gr.c
@@ -73,6 +73,7 @@ int ogl_init_window(int x, int y)
 	}
 
 	SDL_WM_SetCaption(DESCENT_VERSION, "Descent");
+	SDL_WM_SetIcon( SDL_LoadBMP( "d1x-rebirth.ico" ), NULL );
 	if (!SDL_SetVideoMode(x, y, GameArg.DbgBpp, SDL_OPENGL | (ogl_fullscreen ? SDL_FULLSCREEN : 0)))
 	{
 		Error("Could not set %dx%dx%d opengl video mode: %s\n", x, y, GameArg.DbgBpp, SDL_GetError());
diff --git a/arch/sdl/gr.c b/arch/sdl/gr.c
index 50d9c2ab1..59839f099 100644
--- a/arch/sdl/gr.c
+++ b/arch/sdl/gr.c
@@ -99,6 +99,7 @@ int gr_set_mode(u_int32_t mode)
 	screen=NULL;
 
 	SDL_WM_SetCaption(DESCENT_VERSION, "Descent");
+	SDL_WM_SetIcon( SDL_LoadBMP( "d1x-rebirth.ico" ), NULL );
 
 	if(SDL_VideoModeOK(w,h,GameArg.DbgBpp,sdl_video_flags))
 	{
diff --git a/d1x-rebirth.ico b/d1x-rebirth.ico
new file mode 100644
index 000000000..2376334e2
Binary files /dev/null and b/d1x-rebirth.ico differ