diff --git a/.travis.yml b/.travis.yml
index e4447d5e..ca619269 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ os:
 script: make ; make test
 
 before_install:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all uthash-dev uuid-dev libuuid1 xsltproc docbook-xsl
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all uthash-dev uuid-dev libuuid1 xsltproc docbook-xsl ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config cmake c-ares openssl libwebsockets ; fi
 
diff --git a/readme.md b/readme.md
index 20e20d0d..bf3524d8 100644
--- a/readme.md
+++ b/readme.md
@@ -1,5 +1,5 @@
-Mosquitto
-=========
+Eclipse Mosquitto
+=================
 
 Mosquitto is an open source implementation of a server for version 3.1 and
 3.1.1 of the MQTT protocol.
@@ -12,9 +12,8 @@ See the following links for more information on MQTT:
 Mosquitto project information is available at the following locations:
 
 - Main homepage: <http://mosquitto.org/>
-- Find existing bugs: <https://bugs.eclipse.org/bugs/buglist.cgi?product=Mosquitto>
-- Submit a bug: <https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Mosquitto>
-- Source code repository: <http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git/>
+- Find existing bugs or submit a new bug: <https://github.com/eclipse/mosquitto/issues>
+- Source code repository: <https://github.com/eclipse/mosquitto>
 
 There is also a public test server available at <http://test.mosquitto.org/>