diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index f57c3a9..07913ad 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2009-01-21 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor fix in mmsc: fetch URL
 2009-01-17 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Improved mmsc logging
 	* mmsc tools other than mmsc no longer attempt to open admin port
diff --git a/mbuni/mmsbox/mmsbox.c b/mbuni/mmsbox/mmsbox.c
index 047a3af..4730041 100644
--- a/mbuni/mmsbox/mmsbox.c
+++ b/mbuni/mmsbox/mmsbox.c
@@ -759,6 +759,7 @@ int main(int argc, char *argv[])
      
      signal(SIGHUP, relog_now);
      signal(SIGTERM, quit_now);
+     signal(SIGINT,  quit_now);   
      signal(SIGPIPE,SIG_IGN); /* Ignore pipe errors. They kill us sometimes for nothing*/
      
      /* Start sendmms port */     
diff --git a/mbuni/mmsc/mmsc.c b/mbuni/mmsc/mmsc.c
index b71920a..2aae74e 100644
--- a/mbuni/mmsc/mmsc.c
+++ b/mbuni/mmsc/mmsc.c
@@ -63,7 +63,8 @@ int main(int argc, char *argv[])
 
      signal(SIGHUP, relog_now);
      signal(SIGTERM, quit_now);
-     signal(SIGPIPE,SIG_IGN); /* Ignore pipe errors. They kill us sometimes for nothing*/
+     signal(SIGINT,  quit_now);   
+     signal(SIGPIPE,SIG_IGN); /* Ignore pipe errors. They kill us sometimes for no reason*/
 
 
      if ((r_thread = gwthread_create((gwthread_func_t *)mmsrelay, NULL)) < 0)
diff --git a/mbuni/mmsc/mmsc_cfg.c b/mbuni/mmsc/mmsc_cfg.c
index 3ad4226..2096156 100644
--- a/mbuni/mmsc/mmsc_cfg.c
+++ b/mbuni/mmsc/mmsc_cfg.c
@@ -583,7 +583,8 @@ Octstr *mms_makefetchurl(char *qf, Octstr *token, int loc,
 
      MmsDetokenizerFuncStruct *tfs = settings->mms_detokenizefuncs;
      
-     if (host_alias && octstr_len(host_alias) > 0)
+     if (host_alias && octstr_len(host_alias) > 0 &&
+	 octstr_compare(host_alias, settings->hostname) != 0)
 	  hstr = octstr_duplicate(host_alias);
      else 
 	  hstr = octstr_format("%S:%d",