diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47ebda4..d37e1db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,37 @@
Changelog
---------
+##### 1.2.5
+
+- Include libtgl fix to prevent crashes on certain channel messages
+- Improve error handling to be more graceful
+
+##### 1.2.4
+
+- Fix crash on unknown media type
+- Fix crash on logout after cancelling a file transfer
+
+##### 1.2.3
+
+- Build: Allow compilation on Windows #52 Thanks Eion!
+- Build: Drop dependency on LodePNG, Thanks Ben!
+- Build: Gettext is now optional
+
+- Fix issue that prevented to send messages to deleted users in certain cases (#174)
+- Fix own user being added to the buddy list in certain cases
+- Fix that read recipes of own messages are being displayed (#139)
+- Fix encoding inconsistencies with Unicode characters (#177)
+- Fix auto-joining for chats (#179)
+- Fix client not reconnecting anymore under certain circumstances (#173)
+- Fix crash on compat-verification (PullRequest #183)
+
+- Remove pointless "create chat" confirmation dialogue
+- Improve logging messages
+- Always send read recipes when the user is typing or sending a message
+- Improve translation and user messages (#139)
+- Use native password prompts (Adium)
+
+
##### 1.2.2
- fix some licensing issues by not depending on OpenSSL any longer (thanks Ben!)
diff --git a/README.md b/README.md
index 1b61fb7..549bf7d 100644
--- a/README.md
+++ b/README.md
@@ -217,32 +217,12 @@ and `.dsc` files, do this:
Note that the parenthesis are important.
-1.2.4
+1.2.5
-----
-- Fix crash on unknown media type
-- Fix crash on logout after cancelling a file transfer
-
-1.2.3
------
-
-- Build: Allow compilation on Windows #52 Thanks Eion!
-- Build: Drop dependency on LodePNG, Thanks Ben!
-- Build: Gettext is now optional
-
-- Fix issue that prevented to send messages to deleted users in certain cases (#174)
-- Fix own user being added to the buddy list in certain cases
-- Fix that read recipes of own messages are being displayed (#139)
-- Fix encoding inconsistencies with Unicode characters (#177)
-- Fix auto-joining for chats (#179)
-- Fix client not reconnecting anymore under certain circumstances (#173)
-- Fix crash on compat-verification (PullRequest #183)
-
-- Remove pointless "create chat" confirmation dialogue
-- Improve logging messages
-- Always send read recipes when the user is typing or sending a message
-- Improve translation and user messages (#139)
-- Use native password prompts (Adium)
+- Handle revoked sessions automatically
+- Include libtgl fix to prevent crashes on certain channel messages
+- Improve error handling
Discussion / Help
diff --git a/configure b/configure
index 6eb8fc5..b333e4b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for telegram-purple 1.2.4.
+# Generated by GNU Autoconf 2.69 for telegram-purple 1.2.5.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='telegram-purple'
PACKAGE_TARNAME='telegram-purple'
-PACKAGE_VERSION='1.2.4'
-PACKAGE_STRING='telegram-purple 1.2.4'
+PACKAGE_VERSION='1.2.5'
+PACKAGE_STRING='telegram-purple 1.2.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures telegram-purple 1.2.4 to adapt to many kinds of systems.
+\`configure' configures telegram-purple 1.2.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1311,7 +1311,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of telegram-purple 1.2.4:";;
+ short | recursive ) echo "Configuration of telegram-purple 1.2.5:";;
esac
cat <<\_ACEOF
@@ -1421,7 +1421,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-telegram-purple configure 1.2.4
+telegram-purple configure 1.2.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1840,7 +1840,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by telegram-purple $as_me 1.2.4, which was
+It was created by telegram-purple $as_me 1.2.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5106,7 +5106,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by telegram-purple $as_me 1.2.4, which was
+This file was extended by telegram-purple $as_me 1.2.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5168,7 +5168,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-telegram-purple config.status 1.2.4
+telegram-purple config.status 1.2.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index abf90a5..c50bd05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([telegram-purple], [1.2.4])
+AC_INIT([telegram-purple], [1.2.5])
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADERS([config.h])
diff --git a/rpm/purple-telegram.spec b/rpm/purple-telegram.spec
index 2e06e53..ffaae5d 100644
--- a/rpm/purple-telegram.spec
+++ b/rpm/purple-telegram.spec
@@ -1,6 +1,6 @@
Name: purple-telegram
-Version: 1.2.4
-Release: 2%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
Summary: Adds support for Libpurple based messengers
Group: Applications/Internet
License: GPLv2+
@@ -39,6 +39,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/telegram-
%{_datadir}/pixmaps/pidgin/protocols/48/telegram.png
%changelog
+* Sat Jan 23 mjentsch 1.2.5-1
+- build for 1.2.5
+
* Thu Dec 10 2015 tuxmaster 1.2.4-2
- Fix build for appdata.
diff --git a/telegram-adium/telegram-adium/telegram-adium-Info.plist b/telegram-adium/telegram-adium/telegram-adium-Info.plist
index f7f7cdc..2ee5af3 100644
--- a/telegram-adium/telegram-adium/telegram-adium-Info.plist
+++ b/telegram-adium/telegram-adium/telegram-adium-Info.plist
@@ -19,7 +19,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.2.4
+ 1.2.5
CFBundleSignature
AdIM
CFBundleVersion