diff --git a/README.md b/README.md
index bfbf6a429b..7ecd080843 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@
 
 #  [![Build Status](https://travis-ci.org/apache/nifi.svg?branch=master)](https://travis-ci.org/apache/nifi)
 
-[Apache NiFi](https://nifi.apache.org/) is an easy to use, powerful, and 
+[Apache NiFi](https://nifi.apache.org/) is an easy to use, powerful, and
 reliable system to process and distribute data.
 
 ## Table of Contents
@@ -123,8 +123,8 @@ To run NiFi:
 ## Getting Help
 If you have questions, you can reach out to our mailing list: dev@nifi.apache.org
 ([archive](http://mail-archives.apache.org/mod_mbox/nifi-dev)).
-We're also often available in IRC: #nifi on
-[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi).
+For more interactive conversations and chat, we're also often available in IRC: #nifi on
+[irc.freenode.net](http://webchat.freenode.net/?channels=#nifi) and in #NiFi on [ASF HipChat](https://www.hipchat.com/gzh2m5YML). 
 
 ## Documentation
 
@@ -149,28 +149,28 @@ limitations under the License.
 
 ## Export Control
 
-This distribution includes cryptographic software. The country in which you 
+This distribution includes cryptographic software. The country in which you
 currently reside may have restrictions on the import, possession, use, and/or
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check your country's laws, regulations and 
+re-export to another country, of encryption software. BEFORE using any
+encryption software, please check your country's laws, regulations and
 policies concerning the import, possession, or use, and re-export of encryption
 software, to see if this is permitted. See <http://www.wassenaar.org/> for more
 information.
 
-The U.S. Government Department of Commerce, Bureau of Industry and Security 
-(BIS), has classified this software as Export Commodity Control Number (ECCN) 
-5D002.C.1, which includes information security software using or performing 
+The U.S. Government Department of Commerce, Bureau of Industry and Security
+(BIS), has classified this software as Export Commodity Control Number (ECCN)
+5D002.C.1, which includes information security software using or performing
 cryptographic functions with asymmetric algorithms. The form and manner of this
-Apache Software Foundation distribution makes it eligible for export under the 
+Apache Software Foundation distribution makes it eligible for export under the
 License Exception ENC Technology Software Unrestricted (TSU) exception (see the
 BIS Export Administration Regulations, Section 740.13) for both object code and
 source code.
 
-The following provides more details on the included cryptographic software: 
+The following provides more details on the included cryptographic software:
 
-Apache NiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in 
+Apache NiFi uses BouncyCastle, Jasypt, JCraft Inc., and the built-in
 java cryptography libraries for SSL, SSH, and the protection
-of sensitive configuration parameters. See 
+of sensitive configuration parameters. See
 http://bouncycastle.org/about.html
 http://www.jasypt.org/faq.html
 http://jcraft.com/c-info.html
@@ -178,4 +178,4 @@ http://www.oracle.com/us/products/export/export-regulations-345813.html
 for more details on each of these libraries cryptography features.
 
 [nifi]: https://nifi.apache.org/
-[logo]: https://nifi.apache.org/assets/images/apache-nifi-logo.svg
\ No newline at end of file
+[logo]: https://nifi.apache.org/assets/images/apache-nifi-logo.svg