diff --git a/cfg/global_vars.mk b/cfg/global_vars.mk
index bafbe48..97a1fa6 100644
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@@ -13,7 +13,7 @@ MISC_DIR = $(BASE_DIR)/misc
 MANFILES = toxic.1 toxic.conf.5
 DATAFILES = DHTnodes DNSservers toxic.conf.example
 SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
-SNDFILES += ToxicRecvMessage.wav OutgoingCall.wav IncomingCall.wav
+SNDFILES += ToxicRecvMessage.wav ToxicOutgoingCall.wav ToxicIncomingCall.wav
 SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
 
 # Install directories
diff --git a/sounds/IncomingCall.wav b/sounds/IncomingCall.wav
deleted file mode 100644
index fcda125..0000000
Binary files a/sounds/IncomingCall.wav and /dev/null differ
diff --git a/sounds/OutgoingCall.wav b/sounds/OutgoingCall.wav
deleted file mode 100644
index 0489ca9..0000000
Binary files a/sounds/OutgoingCall.wav and /dev/null differ
diff --git a/sounds/ToxicIncomingCall.wav b/sounds/ToxicIncomingCall.wav
new file mode 100644
index 0000000..c70d451
Binary files /dev/null and b/sounds/ToxicIncomingCall.wav differ
diff --git a/sounds/ToxicOutgoingCall.wav b/sounds/ToxicOutgoingCall.wav
new file mode 100644
index 0000000..5cb8e61
Binary files /dev/null and b/sounds/ToxicOutgoingCall.wav differ
diff --git a/sounds/license b/sounds/license
index eddc1a9..93306b4 100644
--- a/sounds/license
+++ b/sounds/license
@@ -1,3 +1,2 @@
-ToxicContactOffline.wav, ToxicRecvMessage.wav, ToxicContactOnline.wav, ToxicTransferComplete.wav, ToxicError.wav and ToxicTransferStart.wav are licensed under the same license as Toxic.
-
-IncomingCall.wav and OutgoingCall.wav are licensed under the "Creative Commons Attribution 3.0 Unported", all credit attributed to Adam Reid.
+ToxicError.wav, ToxicRecvMessage.wav, ToxicContactOffline.wav, ToxicIncomingCall.wav, ToxicTransferComplete.wav, ToxicContactOnline.wav, ToxicOutgoingCall.wav and ToxicTransferStart.wav
+are licensed under the "Creative Commons Attribution 3.0 Unported". All credit attributed to Jfreegman.
diff --git a/src/settings.c b/src/settings.c
index 15f4085..ac850c0 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -342,13 +342,13 @@ int settings_load(struct user_settings *s, const char *patharg)
         if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) ||
                 !set_sound(call_incoming, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
+                set_sound(call_incoming, PACKAGE_DATADIR "/sounds/ToxicIncomingCall.wav");
         }
         
         if ( !config_setting_lookup_string(setting, sound_strings.call_outgoing, &str) ||
                 !set_sound(call_outgoing, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
+                set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/ToxicOutgoingCall.wav");
         }
         
         if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) ||
@@ -373,8 +373,8 @@ int settings_load(struct user_settings *s, const char *patharg)
         set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
         set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
         set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
-        set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
-        set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
+        set_sound(call_incoming, PACKAGE_DATADIR "/sounds/ToxicIncomingCall.wav");
+        set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/ToxicOutgoingCall.wav");
         set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
         set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
         set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");