Index: trunk/src/build_run.c
===================================================================
--- trunk/src/build_run.c	(revision 11631)
+++ trunk/src/build_run.c	(revision 11632)
@@ -106,10 +106,11 @@
 /** pcb_get_info_websites:
  *  Returns a string that has a bunch of information about the websites.
  */
-char *pcb_get_info_websites(void)
+char *pcb_get_info_websites(const char **url_out)
 {
 	static gds_t info;
 	static int first_time = 1;
+	static const char *URL = "http://pcb-rnd.repo.hu\n";
 
 	if (first_time) {
 		first_time = 0;
@@ -116,8 +117,12 @@
 		gds_init(&info);
 
 		gds_append_str(&info, "For more information see:\n");
-		gds_append_str(&info, "http://pcb-rnd.repo.hu\n");
+		gds_append_str(&info, URL);
 	}
+
+	if (url_out != NULL)
+		*url_out = URL;
+
 	return info.array;
 }
 
@@ -136,7 +141,7 @@
 
 		tmp = pcb_get_info_program();
 		gds_append_str(&info, tmp);
-		tmp = pcb_get_info_websites();
+		tmp = pcb_get_info_websites(NULL);
 		gds_append_str(&info, tmp);
 	}
 	return info.array;
@@ -229,7 +234,7 @@
 		gds_append_str(&info, "pcb-rnd is licensed under the terms of the GNU\n");
 		gds_append_str(&info, "General Public License version 2\n");
 		gds_append_str(&info, "See the LICENSE file for more information\n\n");
-		tmp = pcb_get_info_websites();
+		tmp = pcb_get_info_websites(NULL);
 		gds_append_str(&info, tmp);
 
 		tmp = pcb_get_info_compile_options();
Index: trunk/src/build_run.h
===================================================================
--- trunk/src/build_run.h	(revision 11631)
+++ trunk/src/build_run.h	(revision 11632)
@@ -28,7 +28,7 @@
 
 char *pcb_get_info_program(void);
 char *pcb_get_info_copyright(void);
-char *pcb_get_info_websites(void);
+char *pcb_get_info_websites(const char **url_out);
 char *pcb_get_info_comments(void);
 char *pcb_get_info_compile_options(void);
 
Index: trunk/src_plugins/lib_gtk_common/dlg_about.c
===================================================================
--- trunk/src_plugins/lib_gtk_common/dlg_about.c	(revision 11631)
+++ trunk/src_plugins/lib_gtk_common/dlg_about.c	(revision 11632)
@@ -46,6 +46,7 @@
 	GtkWidget *button;
 	GtkWidget *w = gtk_about_dialog_new();
 	GtkAboutDialog *about = GTK_ABOUT_DIALOG(w);
+	const char *url;
 
 	/* Add the compile options button */
 	button = gtk_button_new_with_mnemonic(_("_Options"));
@@ -63,15 +64,8 @@
 
 	gtk_about_dialog_set_copyright(about, pcb_get_info_copyright());
 
-	/*TODO: Find a proper way to include the COPYING file and/or display this info :
-	   gds_append_str(&info, "It is licensed under the terms of the GNU\n");
-	   gds_append_str(&info, "General Public License version 2\n");
-	   gds_append_str(&info, "See the LICENSE file for more information\n\n");
-	 */
+	gtk_about_dialog_set_license(about, pcb_get_infostr());
 
-	gtk_about_dialog_set_license(about,
-															 "It is licensed under the terms of the GNU\n" "General Public License version 2\n"
-															 "See the COPYING file for more information\n\n");
 	/* in GTK3:
 	   gtk_about_dialog_set_license_type(about, GTK_LICENSE_GPL_2_0); */
 	/*FIXME: Refactor the string w.r.t. the dialog */
@@ -78,8 +72,9 @@
 
 	gtk_about_dialog_set_comments(about, pcb_get_info_comments());
 
-	gtk_about_dialog_set_website(about, "http://repo.hu/projects/pcb-rnd/");
-	gtk_about_dialog_set_website_label(about, "Visit the PCB-rnd website");
+	pcb_get_info_websites(&url);
+	gtk_about_dialog_set_website(about, url);
+	gtk_about_dialog_set_website_label(about, "Visit the pcb-rnd website");
 	gtk_about_dialog_set_documenters(about, NULL);
 	gtk_about_dialog_set_translator_credits(about, _("translator-credits"));