diff --git a/debian/changelog b/debian/changelog
index 8143f22..cafe314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,44 +1,52 @@
+sylkserver (1.2.1) unstable; urgency=low
+
+  * Handle case when session is ended while a proposal is pending
+  * Allow SylkServer to be built with Python 2.5
+  * Reworked Debian packaging
+
+ -- Saul Ibarra <saul@ag-projects.com>  Tue, 07 Jun 2011 14:20:13 +0200
+
 sylkserver (1.2.0) unstable; urgency=low
 
   * Added file transfer support
   * Added support for MSRP ACM
   * Terminate all pending subscriptions when stopping a room
   * Fixed outbound IP address on MSRP streams
   * Fixed memory leaks
 
  -- Saul Ibarra <saul@ag-projects.com>  Thu, 19 May 2011 15:51:46 +0200
 
 sylkserver (1.1.0) unstable; urgency=low
 
   * Added incoming REFER support
   * Added outgoing INVITE support
   * Added SIP outbound proxy support
   * Added Trusted Peers based on source IP address
   * Added Access Control Lists support to conference application
   * Added basic multi-application support
   * Added IRC conference application
   * Added SIPThor integration
   * Fixed initialization of TLS settings
   * Made session connect method receive the contact header
   * Catch exception if outgoing NOTIFY could not be sent
   * Fixed exception when sending private message to a participant without chat
   * Refactored exception handling when sending chat messages
   * Refactored application finding mechanism
   * Reject incoming requests with 404 if application is not found
   * Removed SIP MESSAGE support in conference application
 
  -- Saul Ibarra <saul@ag-projects.com>  Fri, 18 Mar 2011 16:43:37 +0100
 
 sylkserver (1.0.1) unstable; urgency=low
 
   * Added unicode support
   * Fixed building CPIMIdentity object
   * Use request URI to match rooms instead of the To header
 
  -- Saul Ibarra <saul@ag-projects.com>  Thu, 17 Feb 2011 10:45:21 +0100
 
 sylkserver (1.0.0) unstable; urgency=low
 
   * Initial release
 
  -- Saul Ibarra <saul@ag-projects.com>  Thu, 27 Jan 2011 17:43:11 +0100
diff --git a/sylk/__init__.py b/sylk/__init__.py
index eb3c965..7268a9e 100644
--- a/sylk/__init__.py
+++ b/sylk/__init__.py
@@ -1,25 +1,25 @@
 # Copyright (C) 2010-2011 AG Projects. See LICENSE for details
 
 """SylkServer"""
 
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 
 configuration_filename = "config.ini"
 
 
 package_requirements = {'python-application': '1.2.8',
                         'python-sipsimple': '0.18.1'}
 
 try:
     from application.dependency import ApplicationDependencies
 except:
     class DependencyError(Exception): pass
     class ApplicationDependencies(object):
         def __init__(self, *args, **kwargs):
             pass
         def check(self):
             raise DependencyError("need python-application version %s or higher but it's not installed" % package_requirements['python-application'])
 
 dependencies = ApplicationDependencies(**package_requirements)