diff --git a/README.md b/README.md
index f4ea9fbd6d..46f2449844 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,12 @@ This documentation provides integrated help in Xcode for all public APIs and a s
 
 ## Changelog
 
+### Version 2.5.4
+
+- General:
+
+    - Declared as final release, since everything in 2.5.4b3 is working as expected
+
 ### Version 2.5.4b3
 
 - General:
diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj
index 092f25e64f..68434e15b5 100644
--- a/Support/HockeySDK.xcodeproj/project.pbxproj
+++ b/Support/HockeySDK.xcodeproj/project.pbxproj
@@ -912,10 +912,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../Vendor\"",
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					"JIRA_MOBILE_CONNECT_SUPPORT_ENABLED=1",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_THUMB_SUPPORT = NO;
 				PRODUCT_NAME = HockeySDK;
 				SKIP_INSTALL = YES;
@@ -930,10 +927,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../Vendor\"",
 				);
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"$(inherited)",
-					"JIRA_MOBILE_CONNECT_SUPPORT_ENABLED=1",
-				);
+				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_THUMB_SUPPORT = NO;
 				PRODUCT_NAME = HockeySDK;
 				SKIP_INSTALL = YES;
@@ -944,6 +938,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_THUMB_SUPPORT = NO;
+				INFOPLIST_FILE = "../Resources/HockeySDK-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -956,6 +951,7 @@
 			buildSettings = {
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_THUMB_SUPPORT = NO;
+				INFOPLIST_FILE = "../Resources/HockeySDK-Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/Support/buildnumber.xcconfig b/Support/buildnumber.xcconfig
index dee3a8c61a..a660c7ec30 100644
--- a/Support/buildnumber.xcconfig
+++ b/Support/buildnumber.xcconfig
@@ -1,3 +1,3 @@
-BUILD_NUMBER = 8
-VERSION_STRING = 2.5.4b3
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\"2.5.4b3\""
+BUILD_NUMBER = 9
+VERSION_STRING = 2.5.4
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\"2.5.4\""
diff --git a/docs/Changelog-template.md b/docs/Changelog-template.md
index 3acab91573..708004c0a0 100644
--- a/docs/Changelog-template.md
+++ b/docs/Changelog-template.md
@@ -1,3 +1,9 @@
+### Version 2.5.4
+
+- General:
+
+    - Declared as final release, since everything in 2.5.4b3 is working as expected
+
 ### Version 2.5.4b3
 
 - General:
diff --git a/docs/HowTo-Integrate-Atlassian-JMC-template.md b/docs/HowTo-Integrate-Atlassian-JMC-template.md
index b5086d247b..a71fd14668 100644
--- a/docs/HowTo-Integrate-Atlassian-JMC-template.md
+++ b/docs/HowTo-Integrate-Atlassian-JMC-template.md
@@ -1,16 +1,37 @@
 ## Introduction
 
-HockeySDK provides integrated setup support for the Atlassian JMC client. This allows you to use the Jira setup data from the corresponding app entry on HockeyApp instead of setting up JMC in code.
+The SDK provides integrated support to automatically configure the Atlassian JIRA Mobile Connect (JMC). It will take the JIRA configuration that is associated to your app on HockeyApp and use that to configure JMC.
 
-The benefit is that if anything changes on your Jira setup, you only have to change it in HockeyApp and all your app installations will use the new setup too.
+## Requirements
 
-**Important:** The binary distribution does not have this functionality integrated!
+The binary distribution of HockeySDK does not provide this integration. You need to follow the [Installation & Setup Advanced](Guide-Installation-Setup-Advanced) Guide and activate the JMC integration as described below.
 
 ## HowTo
 
-Use the [Installation & Setup Advanced](Guide-Installation-Setup-Advanced) which by default integrates JMC
+1. Select `HockeySDK.xcodeproj` project in the Xcode navigator
+2. Select `HockeySDKLib` target
+3. Search for `Preprocessor Macros`
+4. Double tab in the `HockeySDKLib` column and add the following two values
 
+        $(inherited)
+        JIRA_MOBILE_CONNECT_SUPPORT_ENABLED=1
 
-## HowTo - Cocoapods
+5. Setup JMC as described in the [JMC instructions](https://developer.atlassian.com/display/JMC/Enabling+JIRA+Mobile+Connect)
+6. Sign in to HockeyApp
+7. Select the app and edit the apps bug tracker
+8. Choose `JIRA` or `JIRA5`.
+9. Enter your JIRA credentials. Make sure you supply the credentials for a user with admin rights, otherwise HockeyApp cannot fetch the JMC token from JIRA.
+10. Download the latest JMC client file: [https://bitbucket.org/atlassian/jiraconnect-ios/downloads](https://bitbucket.org/atlassian/jiraconnect-ios/downloads)
+11. Unzip the file and move the folder into your project directory.
+12. Drag & drop the JMC folder from your project directory to your Xcode project. Select `Create groups for any added folders` and set the checkmark for your target. Then click `Finish`.
+13. The class `BITHockeyManager` automatically fetches the API token and project key for JMC from HockeyApp, so you don't need to adjust the configuration in your AppDelegate.m file. The only thing you need to do is find a place in your UI to open the feedback view, such as a button and table view cell. You can then open the feedback view as follows:
 
-Add the compiler preprocessor definition `JIRA_MOBILE_CONNECT_SUPPORT_ENABLED=1`
+        In SomeViewController.m:
+
+        [self presentModalViewController:[[JMC sharedInstance] viewController] animated:YES];
+        
+14. You can customize the options of JMC like this:
+
+        In AppDelegate.m:
+
+        [[[JMC sharedInstance] options] setBarStyle:UIBarStyleBlack];