diff --git a/doc/ChangeLog b/doc/ChangeLog
index b58699a..e7ae8ed 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-17         Andrew J. Schorr     <address@hidden>
+
+	* gawktexi.in: Modify inplace.awk to call inplace_end in BEGINFILE
+	and END instead of in ENDFILE. This way, actions in ENDFILE rules
+	will be redirected as expected.
+
 2015-03-08         Arnold D. Robbins     <address@hidden>
 
 	* gawktexi.in: Briefly describe that nonfatal I/O overrides
diff --git a/doc/gawktexi.in b/doc/gawktexi.in
index 8612876..18c55b0 100644
--- a/doc/gawktexi.in
+++ b/doc/gawktexi.in
@@ -33921,11 +33921,16 @@ properly:
 # Please set INPLACE_SUFFIX to make a backup copy.  For example, you may
 # want to set INPLACE_SUFFIX to .bak on the command line or in a BEGIN rule.
 
+# N.B. We call inplace_end in the BEGINFILE and END rules so that any
+# actions in an ENDFILE rule will be redirected as expected.
+
 BEGINFILE @{
-    inplace_begin(FILENAME, INPLACE_SUFFIX)
+    if (_inplace_filename != "")
+        inplace_end(_inplace_filename, INPLACE_SUFFIX)
+    inplace_begin(_inplace_filename = FILENAME, INPLACE_SUFFIX)
 @}
 
-ENDFILE @{
+END @{
     inplace_end(FILENAME, INPLACE_SUFFIX)
 @}
 @end group
diff --git a/test/ChangeLog b/test/ChangeLog
index af980ca..d138497 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-17         Andrew J. Schorr     <address@hidden>
+
+	* inplace1.ok, inplace2.ok, inplace3.ok: Update error message line
+	numbers to reflect changes to inplace.awk.
+
 2015-03-10         Arnold D. Robbins     <address@hidden>
 
 	* Makefile.am (fpat4): New test.
diff --git a/test/inplace1.ok b/test/inplace1.ok
index ffcb768..8256223 100644
--- a/test/inplace1.ok
+++ b/test/inplace1.ok
@@ -1,5 +1,5 @@
 before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is bar replaced?
 stdin end
diff --git a/test/inplace2.ok b/test/inplace2.ok
index ffcb768..8256223 100644
--- a/test/inplace2.ok
+++ b/test/inplace2.ok
@@ -1,5 +1,5 @@
 before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is bar replaced?
 stdin end
diff --git a/test/inplace3.ok b/test/inplace3.ok
index 7cd960b..a7b7254 100644
--- a/test/inplace3.ok
+++ b/test/inplace3.ok
@@ -1,11 +1,11 @@
 before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is bar replaced?
 stdin end
 after
 Before
-gawk: inplace:9: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
+gawk: inplace:14: warning: inplace_begin: disabling in-place editing for invalid FILENAME `-'
 stdin start
 is foo replaced?
 stdin end