diff --git a/contrib/site_description/main.php b/contrib/site_description/main.php
index 610c1d17..fd068c18 100644
--- a/contrib/site_description/main.php
+++ b/contrib/site_description/main.php
@@ -15,11 +15,16 @@ class SiteDescription extends SimpleExtension {
 			$description = $config->get_string("site_description");
 			$page->add_header("<meta name=\"description\" content=\"$description\">");
 		}
+		if(strlen($config->get_string("site_keywords")) > 0) {
+			$keywords = $config->get_string("site_keywords");
+			$page->add_header("<meta name=\"keywords\" content=\"$keywords\">");
+		}
 	}
 
 	public function onSetupBuilding(SetupBuildingEvent $event) {
 		$sb = new SetupBlock("Site Description");
-		$sb->add_longtext_option("site_description");
+		$sb->add_text_option("site_description", "Description: ");
+		$sb->add_text_option("site_keywords", "<br>Keywords: ");
 		$event->panel->add_block($sb);
 	}
 }