diff --git a/boot.php b/boot.php
index c99024d009..95c0351f8d 100644
--- a/boot.php
+++ b/boot.php
@@ -2,11 +2,13 @@
 
 set_time_limit(0);
 
-define('EOL', "<br />\r\n");
+define ( 'BUILD_ID' , 1000 );
 
-define('REGISTER_CLOSED',  0);
-define('REGISTER_APPROVE', 1);
-define('REGISTER_OPEN',    2);
+define ( 'EOL', "<br />\r\n");
+
+define ( 'REGISTER_CLOSED',  0);
+define ( 'REGISTER_APPROVE', 1);
+define ( 'REGISTER_OPEN',    2);
 
 define ( 'DIRECTION_ANY',  0);
 define ( 'DIRECTION_IN',   1);
@@ -162,6 +164,25 @@ function system_unavailable() {
 	killme();
 }}
 
+
+if(! function_exists('check_config')) {
+function check_config(&$a) {
+	$r = q("SELECT * FROM `config` WHERE `cat` = 'system' AND `k` IN ('url','build')");
+	if(! count($r)) {
+		q("INSERT INTO `config` (`cat`,`k`,`v`) VALUES ( 'system', 'url', '%s' )",
+			dbesc($a->get_baseurl())
+		);
+		q("INSERT INTO `config` (`cat`,`k`,`v`) VALUES ( 'system', 'build', '%s' )",
+			dbesc(BUILD_ID)
+		);
+	}
+
+
+
+}}
+
+
+
 if(! function_exists('replace_macros')) {  
 function replace_macros($s,$r) {
 
diff --git a/database.sql b/database.sql
index f0cb98c7a1..a359cc8424 100644
--- a/database.sql
+++ b/database.sql
@@ -32,6 +32,17 @@ CREATE TABLE IF NOT EXISTS `challenge` (
 
 -- --------------------------------------------------------
 
+CREATE TABLE IF NOT EXISTS `config` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cat` char(255) NOT NULL,
+  `k` char(255) NOT NULL,
+  `v` text NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MYISAM DEFAULT CHARSET=utf8;
+
+
+
+
 --
 -- Table structure for table `contact`
 --
diff --git a/index.php b/index.php
index 2353355f0c..ba08a9103a 100644
--- a/index.php
+++ b/index.php
@@ -29,6 +29,8 @@ if((x($_SESSION,'authenticated')) || (x($_POST['auth-params'])))
 
 if($install)
 	$a->module = 'install';
+else
+	check_config($a);
 
 if(strlen($a->module)) {
 	if(file_exists("mod/{$a->module}.php")) {