diff --git a/HockeySDK.podspec b/HockeySDK.podspec
index 5c9ea3df8e..b9600f43c7 100644
--- a/HockeySDK.podspec
+++ b/HockeySDK.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name     = 'HockeySDK'
-  s.version  = '2.5.3'
+  s.version  = '2.5.5'
   s.license  = 'MIT'
   s.platform = :ios, '4.0'
   s.summary  = 'Distribute beta apps and collect crash reports with HockeyApp.'
   s.homepage = 'http://hockeyapp.net/'
   s.author   = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
-  s.source   = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => '2.5.3' }
+  s.source   = { :git => 'https://github.com/bitstadium/HockeySDK-iOS.git', :tag => '2.5.5' }
 
   s.description = 'HockeyApp is a server to distribute beta apps and collect crash reports. '                   \
                   'It improves the testing process dramatically and can be used for both beta '                 \
diff --git a/Support/buildnumber.xcconfig b/Support/buildnumber.xcconfig
index a660c7ec30..47857f8eb2 100644
--- a/Support/buildnumber.xcconfig
+++ b/Support/buildnumber.xcconfig
@@ -1,3 +1,3 @@
-BUILD_NUMBER = 9
-VERSION_STRING = 2.5.4
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\"2.5.4\""
+BUILD_NUMBER = 10
+VERSION_STRING = 2.5.5
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\"2.5.5\""
diff --git a/docs/Changelog-template.md b/docs/Changelog-template.md
index 708004c0a0..54ab56743b 100644
--- a/docs/Changelog-template.md
+++ b/docs/Changelog-template.md
@@ -1,3 +1,21 @@
+### Version 2.5.5
+
+- General:
+
+    - [BUGFIX] Fix some new compiler warnings
+
+- Crash Reporting:
+
+    - [NEW] Add anonymous device ID to crash reports
+    - [BUGFIX] Move calculation of time interval between startup and crash further up in the code, so delegates can use this information e.g. to add it into a log file
+    - [BUGFIX] Call delegate also if a crash was detected but could not be read (if handling crashes on startup is implemented)
+    - [BUGFIX] Format timestamp in crash report to be always UTC in en_US locale
+    - [BUGFIX] Make sure crash reports incident identifier and key don't have special [] chars and some value
+
+- Updating:
+
+    - [BUGFIX] Fix a problem showing the update UI animated if there TTNavigator class is present even though not being used
+
 ### Version 2.5.4
 
 - General: