diff --git a/CHANGES.md b/CHANGES.md
index 6d098c4b..9d478ecd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,36 @@
+BREAKING(!) changes in 3.6.1
+============================
+
+* CMake is now used as build environment. autoconf and friends are gone.
+  (#430, by Rob Day (@rkday).). See `build.sh` for CMake invocations.
+  For a full build, do:
+
+    cmake . -DUSE_GSL=1 -DUSE_PCAP=1 -DUSE_SSL=1 -DUSE_SCTP=1
+    make -j4
+
+
+Bugs fixed in 3.6.1
+===================
+
+* Consistently unescape XML attributes when loading scenario (#458, by
+  Steve Frécinaux (@nud)).
+* Fix buffer overflow in screen output (#479, reported by @brettowe).
+* Fix nonce count in auth headers (#421, by Cody Herzog (@codyherzog)).
+* Fix parser warning when trying to access 0-byte SDP body (by Lin Sun
+  (@sunlin7)).
+* Fix pcapplay on FreeBSD (#434, by Rob Day (@rkday)).
+* Improve build validation (#424, by Stanislav Litvinenko (@dolk13)), a
+  few compiler fixes, a few ncurses fixes (including #436, reported by
+  @TamerL), build cleanup after CMake (#443, #442, by Orgad Shaneh
+  (@orgads)) and libtinfo linker issues (Jeannot Langlois
+  (@jeannotlanglois)).
+* Improve provided sipp.dtd file (#425, by David M. Lee (@leedm777)),
+  and XML fixes by Rob Day.
+* Make it easier to deal with large SIP packets by adding an optional
+  `CPPFLAGS=-DSIPP_MAX_MSG_SIZE=262144` flag (#422, by Cody Herzog
+  (@codyherzog)).
+
+
 BREAKING(!) changes in 3.6.0
 ============================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d877f03c..7c4257ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,9 +102,11 @@ file(WRITE ${PROJECT_SOURCE_DIR}/include/version.cmake
 ")
 add_custom_target(
     version
-    ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/include/version.h.in
-                     -D DST=${PROJECT_BINARY_DIR}/version.h
-                     -P ${PROJECT_SOURCE_DIR}/include/version.cmake
+    if test -d .git \; then
+        ${CMAKE_COMMAND} -D SRC=${PROJECT_SOURCE_DIR}/include/version.h.in
+          -D DST=${PROJECT_BINARY_DIR}/version.h
+          -P ${PROJECT_SOURCE_DIR}/include/version.cmake \;
+    fi
 )
 add_dependencies(sipp version)
 add_dependencies(sipp_unittest version)
diff --git a/README.md b/README.md
index 8addcfd5..a0001e94 100644
--- a/README.md
+++ b/README.md
@@ -64,8 +64,10 @@ list](https://lists.sourceforge.net/lists/listinfo/sipp-users).
 # Making a release
 
 * Update CHANGES.md. Tag release.
-* Download zip, `autoreconf -vif`, copy sipp.1, copy include/version.h.
-* Create tgz. Upload to github as "binary".
+* Make `sipp.1` by calling `help2man --output=sipp.1 -v -v --no-info
+  --name='SIP testing tool and traffic generator' ./sipp`
+* Copy `sipp.1`, copy `version.h`.
+* Create sipp-VERSION.tar.gz with subdirectory sipp-VERSION. Upload to github as "binary".
 * Run `sudo docker build -t sipp-build docker && sudo docker run -it -v $PWD:/src sipp-build` to create a static binary. Upload this to Github as well.
 
 # Contributing