diff --git a/.gitignore b/.gitignore
index 584e97868d7..989bbb02122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,23 @@
+# Files that Git should ignore in the Emacs source directory.
+
+# Copyright 2009-2014 Free Software Foundation, Inc.
+
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+
 # Built by 'autogen.sh'.
 /aclocal.m4
 /configure
@@ -14,9 +34,15 @@ src/config.in
 Info.plist
 InfoPlist.strings
 Makefile
+!admin/charsets/Makefile
+!etc/refcards/Makefile
+!test/automated/flymake/warnpred/Makefile
+!test/indent/Makefile
 makefile
 /*.cache
+/confdefs.h
 /config.status
+/configure.lineno
 src/config.h
 src/epaths.h
 
@@ -46,10 +72,10 @@ src/buildobj.h
 src/globals.h
 
 # Lisp-level sources built by 'make'.
-*cus-load.el
-*loaddefs.el
 leim/changed.misc
 leim/changed.tit
+lisp/**/*cus-load.el
+lisp/**/*loaddefs.el
 lisp/cedet/semantic/bovine/c-by.el
 lisp/cedet/semantic/bovine/make-by.el
 lisp/cedet/semantic/bovine/scm-by.el
@@ -103,13 +129,32 @@ src/stamp-h1
 # Object files and debugging.
 *.a
 *.dSYM/
+*.core
 *.elc
 *.o
 *.res
+[0-9]*.core
+core
+core.*[0-9]
 oo/
 oo-spd/
 src/*.map
 
+# Tests.
+test/indent/*.new
+
+# ctags, etags.
+TAGS
+
+# GNU global.
+GPATH
+GSYMS
+GRTAGS
+GTAGS
+
+# GNU idutils.
+ID
+
 # Executables.
 *.exe
 a.out
@@ -124,7 +169,11 @@ lib-src/movemail
 lib-src/profile
 lib-src/test-distrib
 lib-src/update-game-score
+nextstep/Cocoa/Emacs.base/Contents/Info.plist
+nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj
 nextstep/Emacs.app/
+nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
 src/bootstrap-emacs
 src/emacs
 src/emacs-[0-9]*
@@ -133,6 +182,7 @@ src/temacs
 # Character-set info.
 admin/charsets/*.el
 admin/charsets/*.map
+admin/charsets/jisx2131-filter
 admin/unidata/unidata.txt
 lisp/international/charprop.el
 lisp/international/uni-*.el
@@ -153,6 +203,10 @@ lisp/international/uni-*.el
 *.op
 *.ops
 *.pdf
+!doc/lispintro/cons-*.pdf
+!doc/lispintro/drawers.pdf
+!doc/lispintro/lambda-*.pdf
+!etc/refcards/gnus-logo.pdf
 *.pg
 *.pgs
 *.pj
@@ -167,20 +221,37 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
-!doc/lispintro/cons-*.pdf
-!doc/lispintro/drawers.pdf
-!doc/lispintro/lambda-*.pdf
 doc/misc/cc-mode.ss
 etc/DOC
-!etc/refcards/gnus-logo.pdf
 info/dir
 
-# Backup files and locks.
+# Version control and locks.
+*.orig
+*.rej
 *~
 .#*
-
-# Git output.
 [0-9]*.patch
 
+# Built by 'make install'.
+etc/emacs.tmpdesktop
+
 # Distribution directories.
 /emacs-[1-9]*/
+
+# Microsoft-related builds and installations.
+*.in-h
+_*
+!build-aux/snippet/_Noreturn.h
+/bin/
+/BIN/
+/data/
+etc/icons/
+lib/cxxdefs.h
+lib/SYS/
+/libexec/
+/lock/
+/README.W32
+/share/
+/site-lisp/
+src/gdb.ini
+/var/
diff --git a/ChangeLog b/ChangeLog
index 9de94076e6e..22f0698a1f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2014-11-21  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Add more of the old .bzrignore to .gitignore.
+	Plus a few more .gitignore improvements.
+	* .gitignore: Add copyright notice, since it's big enough.
+	Put exceptions immediately after the patterns they're exceptions
+	to, to make them easier to follow.
+	Give four exceptions for the Makefile pattern.
+	Ignore /confdefs.h, test/indent/*.new, TAGS, GPATH, GSYMS, GRTAGS,
+	GTAGS, ID, *.exe, some nextstep-related files,
+	jisx2131-filter, *.orig, *.rej, etc/emacs.tmpdesktop, *.in-h
+	_* (except for build-aux/snippet/_Noreturn.h), /bin/, /BIN/,
+	/data/, etc/icons/, lib/cxxdefs.h, lib/SYS/, /libexec/, /lock/,
+	/README.W32, /share/, /site-lisp/, src/gdb.ini, /var/.
+	Ignore /configure.lineno, since POSIX requires
+	LINENO only with the User Portability Utilities option.
+	Ignore *cust-load.el and *loaddefs.el only under lisp.
+	Ignore core files of various flavors.
+	Do not ignore etc/refcards/gnus-logo.pdf.
+
 2014-11-21  Eli Zaretskii  <eliz@gnu.org>
 
 	* .gitignore: Add back src/_gdbinit, which is a temporary file