diff --git a/addressbook/setup/config.inc.php b/addressbook/setup/config.inc.php
index 0d1f7aef2e..cac3518a12 100644
--- a/addressbook/setup/config.inc.php
+++ b/addressbook/setup/config.inc.php
@@ -11,6 +11,10 @@
     <?php if (!$current_config["contact_application"]) { $current_config["contact_application"] = "addressbook"; } ?>
     <td><input name="newsettings[contact_application]" value="<?php echo $current_config["contact_application"]; ?>"></td>
    </tr>
+   <tr bgcolor="e6e6e6">
+    <td>Select from list instead of text entry for country:</td>
+    <td><input type="checkbox" name="newsettings[countrylist]" value="True"<?php echo ($current_config["countrylist"]?" checked":""); ?>></td>
+   </tr>
    <?php $selected[$current_config["contact_repository"]] = " selected"; ?>
    <tr bgcolor="e6e6e6">
     <td>Select where you want to store/retrieve contacts.</td>
diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index dacda3cb76..45724fdcbc 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -1,4 +1,18 @@
 <?php
+	/**************************************************************************\
+	* phpGroupWare - Bookmarks                                                 *
+	* http://www.phpgroupware.org                                              *
+	* Based on Bookmarker Copyright (C) 1998  Padraic Renaghan                 *
+	*                     http://www.renaghan.com/bookmarker                   *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+
+	/* $Id$ */
+
 	/* Basic information about this app */
 	$setup_info['addressbook']['name']      = 'addressbook';
 	$setup_info['addressbook']['title']     = 'Addressbook';