diff --git a/config/defaults.yml b/config/defaults.yml
index 8cf35d41b..1200253a7 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -40,6 +40,34 @@ defaults:
     unicorn_timeout: 90
     embed_sidekiq_worker: false
     sidekiq_workers: 1
+  chat:
+    enabled: false
+    server:
+      enabled: true
+      certs: 'config/vines'
+      accept_self_signed: false
+      cross_domain_messages: true
+      max_offline_msgs: 150
+      c2s:
+        address: '0.0.0.0'
+        port: 5222
+        max_stanza_size: 65536
+        max_resources_per_account: 5
+      s2s:
+        address: '0.0.0.0'
+        port: 5269
+        max_stanza_size: 131072
+        blacklist: []
+      bosh:
+        proxy: false
+        address: '0.0.0.0'
+        port: 5280
+        bind: '/http-bind'
+        max_stanza_size: 65536
+        max_resources_per_account: 5
+      log:
+        file: 'log/vines.log'
+        level: 'info'
   privacy:
     jquery_cdn: false
     google_analytics_key:
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index 152f370bb..0286b5906 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -169,6 +169,102 @@ configuration: ## Section
     ## increase environment.sidekiq.concurrency instead!
     #sidekiq_workers: 1
 
+  ## Diaspora has a internal XMPP server. If you like a chat or want
+  ## to use a custom server then you should touch following configuration
+  ##
+  ## The internal xmpp server does not support https
+  ## and even if we implement it, we would ran into certificate issues.
+  ## The problem with mixed-content is described here:
+  ## https://github.com/Zauberstuhl/diaspora/issues/6
+  ##
+  ## The easiest way of avoiding certificate and mixed-content issues
+  ## is to use a proxy, e.g.:
+  ##
+  ## Apache: https://gist.github.com/Zauberstuhl/2d09330961614b12b642
+  ## Nginx: https://gist.github.com/Zauberstuhl/ee95e1eacefa6ddbec6e
+  ##
+  ## If you configured your proxy correctly you should adjust
+  ## the configuration in the BOSH section
+  chat: ## Section
+
+    ## Enable the chat and all his components
+    #enabled: true
+    ## Custom XMPP server configuration goes here
+    server: ## Section
+
+      ## If you have a own XMPP server you can disable the default one
+      #enabled: false
+      # Set the directory in which to look for virtual hosts' TLS certificates
+      #certs: 'config/vines'
+      # The server accepts on default only valid certificates.
+      # Any connection which uses self-signed will be closed.
+      # If you'd like to accept self-signed certificates
+      # on your server set the next option to true
+      #accept_self_signed: true
+      # Only touch the next option if you'd like to deny
+      # your user to exchange messages between other XMPP server
+      #cross_domain_messages: false
+      # Set the maximum of offline messages stored per user (default=150).
+      # If it exceeds it will start deleting old messages. You can disable
+      # offline message support completely by setting the option to zero.
+      #max_offline_msgs: 150
+      ## client to server
+      c2s: ## Section
+
+        # Configure the address vines should listen on
+        #address: '0.0.0.0'
+        # Configure the client-to-server port
+        #port: 5222
+        # The maximum we'd like to allow for stanza size
+        #max_stanza_size: 65536
+        # The max_resources_per_account attribute limits how many
+        # concurrent connections one user can have to the server
+        #max_resources_per_account: 5
+
+      # server to server
+      s2s: ## Section
+
+        # Configure the address vines should listen on
+        #address: '0.0.0.0'
+        # Configure the server-to-server port
+        #port: 5269
+        # The max_stanza_size attribute should be
+        # much larger than the setting for client-to-server
+        #max_stanza_size: 131072
+        # On default every xmpp server with a valid certificate
+        # is able to communicate with your server. In case of
+        # malicous server (e.g. spam reason) you can black-list them:
+        #blacklist:
+        #  - 'example.com'
+        #  - 'malicous.net'
+
+      # XEP-0124 BOSH requests
+      bosh: ## Section
+
+        # If you'd like to use a proxy you should set the proxy
+        # option to true, otherwise jsxc always tries to
+        # connect directly to the port specified below
+        #proxy: true
+        # Configure the address vines should listen on
+        #address: '0.0.0.0'
+        # Configure the BOSH port
+        #port: 5280
+        # Configure the bind endpoint
+        #bind: '/http-bind'
+        # The maximum we'd like to allow for stanza size
+        #max_stanza_size: 65536
+        # The max_resources_per_account attribute limits how many
+        # concurrent connections one user can have to the server
+        #max_resources_per_account: 5
+
+      # Specify log behaviour here
+      log: ## Section
+        # log file location
+        #file: 'log/vines.log'
+        # Set the logging level to debug, info, warn, error, or fatal. The debug
+        # level logs all XML sent and received by the server.
+        #level: 'info'
+
   ## Settings potentially affecting the privacy of your users
   privacy: ## Section