diff --git a/.gitignore b/.gitignore
index 2292cc934..2b0156acd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ ahci_test
 ascii.bitmaps
 ascii.h
 autom4te.cache
-build_env.mk
 build-grub-gen-asciih
 build-grub-gen-widthspec
 build-grub-mkfont
@@ -32,48 +31,59 @@ docs/*.info
 docs/stamp-vti
 docs/version.texi
 ehci_test
-*.elf
 example_grub_script_test
 example_scripted_test
 example_unit_test
 *.exec
+*.exec.exe
 fddboot_test
 genkernsyms.sh
 gensymlist.sh
 gentrigtables
+gentrigtables.exe
 gettext_strings_test
 grub-bin2h
-grub-bios-setup
+/grub-bios-setup
+/grub-bios-setup.exe
 grub_cmd_date
 grub_cmd_echo
 grub_cmd_regexp
 grub_cmd_set_date
 grub_cmd_sleep
-grub-editenv
+/grub-editenv
+/grub-editenv.exe
 grub-emu
 grub-emu-lite
+grub-emu.exe
+grub-emu-lite.exe
 grub_emu_init.c
 grub_emu_init.h
 grub-fstest
+grub-fstest.exe
 grub_fstest_init.c
 grub_fstest_init.h
 grub_func_test
 grub-install
+grub-install.exe
 grub-kbdcomp
 grub-macho2img
-grub-menulst2cfg
+/grub-menulst2cfg
+/grub-menulst2cfg.exe
 /grub-mk*
 grub-mount
-grub-ofpathname
-grub-pe2elf
-grub-probe
+/grub-ofpathname
+/grub-ofpathname.exe
+grub-core/build-grub-pe2elf.exe
+/grub-probe
+/grub-probe.exe
 grub_probe_init.c
 grub_probe_init.h
-grub-reboot
+/grub-reboot
 grub_script_blanklines
 grub_script_blockarg
 grub_script_break
 grub-script-check
+grub-script-check.exe
 grub_script_check_init.c
 grub_script_check_init.h
 grub_script_comments
@@ -104,17 +114,18 @@ grub_script.tab.h
 grub_script.yy.c
 grub_script.yy.h
 grub-set-default
-grub-setup
 grub_setup_init.c
 grub_setup_init.h
 grub-shell
 grub-shell-tester
 grub-sparc64-setup
+grub-sparc64-setup.exe
 gzcompress_test
 hddboot_test
 help_test
 *.img
 *.image
+*.image.exe
 include/grub/cpu
 include/grub/machine
 install-sh
@@ -181,6 +192,7 @@ grub-core/gmodule.pl
 grub-core/grub.chrp
 grub-core/modinfo.sh
 grub-core/*.module
+grub-core/*.module.exe
 grub-core/*.pp
 util/bash-completion.d/grub
 grub-core/gnulib/alloca.h
@@ -202,7 +214,7 @@ grub-core/gnulib/unistd.h
 grub-core/gnulib/warn-on-use.h
 grub-core/gnulib/wchar.h
 grub-core/gnulib/wctype.h
-grub-core/rs_decoder.S
+grub-core/rs_decoder.h
 widthspec.bin
 widthspec.h
 docs/stamp-1
@@ -216,9 +228,14 @@ include/grub/gcrypt/gcrypt.h
 include/grub/gcrypt/g10lib.h
 po/POTFILES.in
 po/POTFILES-shell.in
-grub-glue-efi
-grub-render-label
+/grub-glue-efi
+/grub-render-label
+/grub-glue-efi.exe
+/grub-render-label.exe
 grub-core/gnulib/locale.h
 grub-core/gnulib/unitypes.h
 grub-core/gnulib/uniwidth.h
 build-aux/test-driver
+/garbage-gen
+/garbage-gen.exe
+/grub-fs-tester
diff --git a/ChangeLog b/ChangeLog
index 22130d062..e3d7814fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* .gitignore: Add .exe variants. Add missing files. Remove few outdated
+	entries.
+
 2013-12-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/osdep/exec.c: Use unix version on cygwin.