diff --git a/debian/apache2/virtualhost.conf b/debian/apache2/virtualhost.conf
index ad13c76..fadd2f3 100644
--- a/debian/apache2/virtualhost.conf
+++ b/debian/apache2/virtualhost.conf
@@ -8,6 +8,14 @@ DocumentRoot "/usr/share/noosfero/public"
 
 RewriteEngine On
 
+# If your XMPP XMPP/BOSH isn't in localhost, change the config below to correct
+# point to address
+RewriteRule /http-bind http://localhost:5280/http-bind [P,QSA,L]
+<Proxy http://localhost:5280/http-bind>
+  Order Allow,Deny
+  Allow from All
+</Proxy>
+
 # Rewrite index to check for static index.html
 RewriteRule ^/$ /index.html [QSA]
 
diff --git a/debian/update-noosfero-apache b/debian/update-noosfero-apache
index a1b9d2f..b280435 100755
--- a/debian/update-noosfero-apache
+++ b/debian/update-noosfero-apache
@@ -17,13 +17,13 @@ if test -x /usr/share/noosfero/script/apacheconf; then
   if ! test -e "$apache_site"; then
     echo "Generating apache virtual host ..."
     cd /usr/share/noosfero && su noosfero -c "RAILS_ENV=production ./script/apacheconf virtualhosts" > "$apache_site"
-  else
-    pattern="Include \/etc\/noosfero\/apache\/virtualhost.conf"
-    include="Include \/usr\/share\/noosfero\/util\/chat\/apache\/xmpp.conf"
-    if ! cat $apache_site | grep "^ *$include" > /dev/null ; then
-      echo "Updating apache virtual host ..."
-      sed -i "s/.*$pattern.*/  $include\n&/" $apache_site
-    fi
+  fi
+
+  # remove old way to include chat config
+  pattern="Include \/usr\/share\/noosfero\/util\/chat\/apache\/xmpp.conf"
+  if cat $apache_site | grep "^ *$pattern" > /dev/null ; then
+    echo "Removing obsolete chat configuration ..."
+    sed -i "/.*$pattern.*/d" $apache_site
   fi
 
   echo 'Noosfero Apache configuration updated.'
diff --git a/script/apacheconf b/script/apacheconf
index 71251d1..b9784eb 100755
--- a/script/apacheconf
+++ b/script/apacheconf
@@ -17,7 +17,6 @@ when 'virtualhosts'
       puts "  #{server_directive} #{domain.name}"
       server_directive = 'ServerAlias'
     end
-    puts "  Include /usr/share/noosfero/util/chat/apache/xmpp.conf"
     puts "  Include /etc/noosfero/apache/virtualhost.conf"
     puts "</VirtualHost>"
   end
diff --git a/util/chat/apache/xmpp.conf b/util/chat/apache/xmpp.conf
deleted file mode 100644
index 0926367..0000000
--- a/util/chat/apache/xmpp.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# If your XMPP XMPP/BOSH isn't in localhost, change the config below to correct
-# point to address
-
-  RewriteEngine On
-  RewriteRule /http-bind http://localhost:5280/http-bind [P,QSA,L]
-  <Proxy http://localhost:5280/http-bind>
-    Order Allow,Deny
-    Allow from All
-  </Proxy>
-
-# vim: ft=apache
--
libgit2 0.21.2