diff --git a/sflphone-gtk/src/Makefile.am b/sflphone-gtk/src/Makefile.am
index 9c2fc02c5fede5645dc0ec686b310e7beea4487d..eeaa1392ff4c04cd4b397c68a6187627f065f66c 100644
--- a/sflphone-gtk/src/Makefile.am
+++ b/sflphone-gtk/src/Makefile.am
@@ -28,4 +28,5 @@ sflphone_gtk_LDADD = $(DEPS_LIBS)
 
 AM_CPPFLAGS = $(DEPS_CFLAGS) \
               -DICONS_DIR=\""$(datadir)/sflphone"\" \
-              -DICON_DIR=\""$(datadir)/pixmaps"\"
+              -DICON_DIR=\""$(datadir)/pixmaps"\" \
+	      -DCODECS_DIR=\""$(libdir)/sflphone/codecs"\"
diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index 37dfea4751361e471f823e006efe04842654434f..0ec2ae1e8a0d224c34fca8cd88f92a5fcd631357 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -619,5 +619,12 @@ sflphone_fill_codec_list()
       codec_list_add(c);
     }
   }
+  if( codec_list_get_size() == 0) {
+    gchar* markup = malloc(1000);
+    sprintf(markup , "<b>Error: No audio codecs found.\n\n</b> SFL audio codecs have to be placed in <i>%s</i> or in the <b>.sflphone</b> directory in your home( <i>%s</i> )", CODECS_DIR , g_get_home_dir());
+    main_window_error_message( markup );
+    g_free( markup );
+    dbus_unregister(getpid());
+    exit(0);
+  }
 }
-  
diff --git a/sflphone-gtk/src/mainwindow.h b/sflphone-gtk/src/mainwindow.h
index a1ec85f86c9b3ed79e2b7048237f58f31983492d..318f078d9636329fc2648f43df4b528ade34eb0a 100644
--- a/sflphone-gtk/src/mainwindow.h
+++ b/sflphone-gtk/src/mainwindow.h
@@ -41,7 +41,7 @@ void main_window_error_message(gchar * markup);
 
 void main_window_warning_message(gchar * markup);
 
-void main_window_warning_message(gchar * markup);
+void main_window_info_message(gchar * markup);
 
 void status_bar_message(const gchar * message);
 
diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c
index e95bb18e9fe19aedbdf4b26f08d2a5807a512a6e..6a9540ed009bc1c7dbbd2ff3112e0f619306c797 100644
--- a/sflphone-gtk/src/menus.c
+++ b/sflphone-gtk/src/menus.c
@@ -106,11 +106,8 @@ help_about ( void * foo)
     "Julien Plissonneau Duquene <julien.plissonneau.duquene@savoirfairelinux.com>",
     "Alexandre Bourget <alexandre.bourget@savoirfairelinux.com>",
     "Pierre-Luc Beaudoin <pierre-luc@squidy.info>", 
-    "Imran Akbar", 
     "Jean-Philippe Barrette-LaPierre",
     "Laurielle Lea",
-    "Mikael Magnusson",
-    "Sherry Yang", 
     NULL};
   gchar *artists[] = {
     "Pierre-Luc Beaudoin <pierre-luc@squidy.info>",