diff --git a/ChangeLog b/ChangeLog
index 21541de..8936c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,26 +3,36 @@
        * Version 1.2.5 released.
 
        * New features:
-               * Bind to a specific IP address with --bind-server. (Philipp Haselwarter)
-               * MOSH_ESCAPE_KEY configures escape character.  (Timo J. Rinne)
+               * Bind to a specific IP address with --bind-server. (Philipp
+		 Haselwarter)
+               * MOSH_ESCAPE_KEY configures escape character.  (Timo
+		 J. Rinne)
                * Support non-roaming IPv6. (Anders Kaseorg)
-               * Implement XTerm mouse mode. (Barosl LEE, Andrew Chin, Louis Kruger)
-               * Report Git revision along with version if available.  (John Hood)
+               * Implement XTerm mouse mode. (Barosl LEE, Andrew Chin,
+		 Louis Kruger)
+               * Report Git revision along with version if available.
+		 (John Hood)
 
        * Platform support:
                * Add pselect() emulation. (Jérémie Courrèges-Anglas)
-               * OpenBSD, OS X: Fix be64toh-related issues. (Jérémie Courrèges-Anglas)
+               * OpenBSD, OS X: Fix be64toh-related issues. (Jérémie
+		 Courrèges-Anglas)
                * ARM Neon: fix gcc4.8 compiling problem(Pasi Sjöholm)
-               * NaCl: Conditionally rename main to mosh_main. (Richard Woodbury)
+               * NaCl: Conditionally rename main to mosh_main. (Richard
+		 Woodbury)
                * FreeBSD: Token pasting, forkpty(), ARM fixes. (John Hood)
                * AIX: Implement CTTY grabbing when TIOCSCTTY is missing
                  (Anton Lundin)
+	       * OS X: Broaden build support to cover OS X 10.5 through
+		 10.10. (John Hood)
+	       * Debian: Improve bash-completion install and
+		 functionality. (Suggested by Gabriel Filion, John Hood)
 
        * Bug fixes:
                * Automake/autoconf workarounds.  (Anders Kaseorg)
                * mosh-server: Allow startup without PTY.  (Keith Winstein)
-               * network.cc: Properly close old fd on Socket assignment operator.
-                 (Thanks to Igor Bukanov)
+               * network.cc: Properly close old fd on Socket assignment
+		 operator. (Thanks to Igor Bukanov)
                * mosh-server:  Allow startup with zero-window-size PTY.
                  (Igor Bukanov)
                * AddrInfo: Fix error message generation when node == NULL
diff --git a/configure.ac b/configure.ac
index 9622579..5b57a4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT([mosh], [1.2.4.95rc1], [mosh-devel@mit.edu])
+AC_INIT([mosh], [1.2.4.95rc2], [mosh-devel@mit.edu])
 AM_INIT_AUTOMAKE([foreign -Wall -Werror])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([src/frontend/mosh-client.cc])
diff --git a/debian/changelog b/debian/changelog
index f336071..77e4e90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,38 @@
-mosh (1.2.4.95rc1-1) unstable; urgency=low
+mosh (1.2.4.95rc2-1) unstable; urgency=low
 
   * Version 1.2.5 release candidate.
 
   * New features:
-    * Bind to a specific IP address with --bind-server. (Philipp Haselwarter)
-    * MOSH_ESCAPE_KEY configures escape character.  (Timo J. Rinne)
+    * Bind to a specific IP address with --bind-server. (Philipp
+      Haselwarter)
+    * MOSH_ESCAPE_KEY configures escape character.  (Timo
+      J. Rinne)
     * Support non-roaming IPv6. (Anders Kaseorg)
-    * Implement XTerm mouse mode. (Barosl LEE, Andrew Chin, Louis Kruger)
-    * Report Git revision along with version if available.  (John Hood)
+    * Implement XTerm mouse mode. (Barosl LEE, Andrew Chin,
+      Louis Kruger)
+    * Report Git revision along with version if available.
+      (John Hood)
 
   * Platform support:
     * Add pselect() emulation. (Jérémie Courrèges-Anglas)
-    * OpenBSD, OS X: Fix be64toh-related issues. (Jérémie Courrèges-Anglas)
+    * OpenBSD, OS X: Fix be64toh-related issues. (Jérémie
+      Courrèges-Anglas)
     * ARM Neon: fix gcc4.8 compiling problem(Pasi Sjöholm)
-    * NaCl: Conditionally rename main to mosh_main. (Richard Woodbury)
+    * NaCl: Conditionally rename main to mosh_main. (Richard
+      Woodbury)
     * FreeBSD: Token pasting, forkpty(), ARM fixes. (John Hood)
     * AIX: Implement CTTY grabbing when TIOCSCTTY is missing
       (Anton Lundin)
+    * OS X: Broaden build support to cover OS X 10.5 through
+      10.10. (John Hood)
+    * Debian: Improve bash-completion install and
+      functionality. (Suggested by Gabriel Filion, John Hood)
 
   * Bug fixes:
     * Automake/autoconf workarounds.  (Anders Kaseorg)
     * mosh-server: Allow startup without PTY.  (Keith Winstein)
-    * network.cc: Properly close old fd on Socket assignment operator.
-      (Thanks to Igor Bukanov)
+    * network.cc: Properly close old fd on Socket assignment
+      operator. (Thanks to Igor Bukanov)
     * mosh-server:  Allow startup with zero-window-size PTY.
       (Igor Bukanov)
     * AddrInfo: Fix error message generation when node == NULL
diff --git a/fedora/mosh.spec b/fedora/mosh.spec
index 5c191e9..7edaa0a 100644
--- a/fedora/mosh.spec
+++ b/fedora/mosh.spec
@@ -1,5 +1,5 @@
 Name:		mosh
-Version:	1.2.4.95rc1
+Version:	1.2.4.95rc2
 Release:	1%{?dist}
 Summary:	Mobile shell that supports roaming and intelligent local echo
 
@@ -52,6 +52,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 26 2015 John Hood <cgull@glup.org> - 1.2.4.95rc2-1
+- Update to mosh 1.2.4.95rc2
+
 * Mon Jun 08 2015 John Hood <cgull@glup.org> - 1.2.4.95rc1-1
 - Update to mosh 1.2.4.95rc1