diff --git a/CHANGES b/CHANGES
index da56e21f29..0f2ff71473 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2808.	[bug]		atomic.h was not being properly installed under all
+			circumstances. [RT #20722]
+
 2807.	[bug]		Fixed a possible ASSERT when reconfiguring zone
 			keys. [RT #20720]
 
diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in
index 614b3d9f6e..e741c656dc 100644
--- a/lib/isc/Makefile.in
+++ b/lib/isc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.104 2009/12/05 23:31:41 each Exp $
+# $Id: Makefile.in,v 1.105 2009/12/18 03:05:37 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -123,8 +123,9 @@ installdirs:
 install:: timestamp installdirs
 	${LIBTOOL_MODE_INSTALL} ${INSTALL_DATA} libisc.@A@ ${DESTDIR}${libdir}
 
-install:: @ISC_ARCH_DIR@/include/isc/atomic.h
-	${INSTALL_DATA} @ISC_ARCH_DIR@/include/isc/atomic.h ${DESTDIR}${includedir}/isc
+install:: ${srcdir}/@ISC_ARCH_DIR@/include/isc/atomic.h
+	${INSTALL_DATA} ${srcdir}/@ISC_ARCH_DIR@/include/isc/atomic.h \
+	${DESTDIR}${includedir}/isc
 
 clean distclean::
 	rm -f libisc.@A@ libisc-nosymtbl.@A@ libisc.la \