diff --git a/debian/changelog b/debian/changelog
index ad3d628..fddd7f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+busybox (1:1.17.1-8ubuntu2) natty; urgency=low
+
+  * Turn on CGI support for httpd (LP: #710634)
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Mon, 31 Jan 2011 20:57:57 +0800
+
 busybox (1:1.17.1-8ubuntu1) natty; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:
diff --git a/debian/config/pkg/deb b/debian/config/pkg/deb
index 72c5e5f..5b81f15 100644
--- a/debian/config/pkg/deb
+++ b/debian/config/pkg/deb
@@ -724,9 +724,9 @@ CONFIG_HTTPD=y
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 # CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 # CONFIG_FEATURE_HTTPD_PROXY is not set
diff --git a/debian/config/pkg/static b/debian/config/pkg/static
index fe65294..d781ee7 100644
--- a/debian/config/pkg/static
+++ b/debian/config/pkg/static
@@ -725,9 +725,9 @@ CONFIG_HTTPD=y
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
+CONFIG_FEATURE_HTTPD_CGI=y
+CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
+CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 # CONFIG_FEATURE_HTTPD_PROXY is not set