diff --git a/AUTHORS b/AUTHORS
index 95c6b16fc..25e19ba73 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,6 +51,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Fumihito Yoshida
   Michael McCann
   Owen Clarke
+  Ben Boeckel
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 243fb44c6..5716eda42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,14 +24,15 @@ else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 message ("-- Looking for SHA1 references")
-if (EXISTS .git/index)
+if (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
   set (HAVE_COMMIT true)
   execute_process (COMMAND git log -1 --pretty=format:%h
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                    OUTPUT_VARIABLE COMMIT)
   configure_file ( ${CMAKE_SOURCE_DIR}/commit.h.in
                    ${CMAKE_SOURCE_DIR}/commit.h)
   message ("-- Found SHA1 reference: ${COMMIT}")
-endif (EXISTS .git/index)
+endif (EXISTS ${CMAKE_SOURCE_DIR}/.git/index)
 
 set (PACKAGE "${PROJECT_NAME}")
 set (VERSION "${PROJECT_VERSION}")
diff --git a/ChangeLog b/ChangeLog
index 07a88c9c6..3ba4b7bb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -124,10 +124,12 @@
    Clarke).
  + Fixed bug #788, which reported regex and readline versions, even though they
    are not used.
- + Fixed bug #792, #793, #794 and #795, so that cmake now recognizes and builds
-   on Solaris (thanks to Owen Clarke).
- + Fixed bug #797 which corrects a build problem with 'srandom' (thanks to Owen
-   Clarke).
+ + Applied patches for bugs #792, #793, #794 and #795, so that cmake now
+   recognizes and builds on Solaris (thanks to Owen Clarke).
+ + Applied patch for bug #797 which corrects a build problem with 'srandom'
+   (thanks to Owen Clarke).
+ + Applied patches for bug #798 which allows out-of-source builds (thanks to
+   Ben Boeckel).
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.