diff --git a/noise2cable.sh b/noise2cable.sh
index 10eaa0c..0c5a2fc 100755
--- a/noise2cable.sh
+++ b/noise2cable.sh
@@ -20,10 +20,16 @@ s/Noise\\/Cable\\/g;
 s/Noise:/Cable:/g;
 s/Noise$/Cable/g' {} +
 
-sed -i 's|https://textsecure-service\.whispersystems\.org|https://139\.162\.192\.233:8080|' build.gradle
-
 sed -i 's/Your (Signal|TextSecure) verification code:/Your (Cable) verification code:/' src/org/thoughtcrime/securesms/service/SmsListener.java
 
+# Change the server addresses
+sed -i '/SIGNAL_URL/ s|textsecure-service\.whispersystems\.org|cable-service.cable.im|' build.gradle
+sed -i '/REDPHONE_MASTER_URL/ s|redphone-master\.whispersystems\.org|redphone-master.cable.im|' build.gradle
+sed -i '/REDPHONE_RELAY_HOST/ s|relay\.whispersystems\.org|redphone-relay.cable.im|' build.gradle
+sed -i '/REDPHONE_PREFIX_NAME/ s|\.whispersystems\.org|.cable.im|' build.gradle
+
+# Change the user agent
+sed -i '/USER_AGENT/ s/OWA/CBL/' build.gradle
 
 ### The following are needed to install Cable in parallel with Signal or Noise: