diff --git a/Bundler/cgi.xml b/Bundler/cgi.xml
new file mode 100644
index 0000000..c2a2df3
--- /dev/null
+++ b/Bundler/cgi.xml
@@ -0,0 +1,6 @@
+<Bundle name="cgi">
+  <Group name="nginx">
+    <Package name="fcgiwrap"/>
+    <Path name="/etc/nginx/snippets/cgi.conf"/>
+  </Group>
+</Bundle>
diff --git a/Bundler/gitweb.xml b/Bundler/gitweb.xml
new file mode 100644
index 0000000..d542b8d
--- /dev/null
+++ b/Bundler/gitweb.xml
@@ -0,0 +1,3 @@
+<Bundle name="gitweb">
+  <Package name="gitweb"/>
+</Bundle>
diff --git a/Cfg/etc/nginx/snippets/cgi.conf/cgi.conf b/Cfg/etc/nginx/snippets/cgi.conf/cgi.conf
new file mode 100644
index 0000000..3592947
--- /dev/null
+++ b/Cfg/etc/nginx/snippets/cgi.conf/cgi.conf
@@ -0,0 +1,10 @@
+location ~ .cgi$ {
+	if (!-e $request_filename) {
+		return 404;
+	}
+
+	include fastcgi_params;
+	fastcgi_index  index.cgi;
+	fastcgi_pass unix:/var/run/fcgiwrap.socket;
+}
+
diff --git a/Cfg/etc/nginx/snippets/cgi.conf/info.xml b/Cfg/etc/nginx/snippets/cgi.conf/info.xml
new file mode 100644
index 0000000..28fd470
--- /dev/null
+++ b/Cfg/etc/nginx/snippets/cgi.conf/info.xml
@@ -0,0 +1,3 @@
+<FileInfo>
+    <Info owner='root' group='root' perms='0644'/>
+</FileInfo>
diff --git a/Metadata/groups.xml b/Metadata/groups.xml
index 909db2c..e878d63 100644
--- a/Metadata/groups.xml
+++ b/Metadata/groups.xml
@@ -29,7 +29,7 @@
     <Group name="debian-mirror"/>
     <Group name="webmasters"/>
     <Group name="ntp-server"/>
-    <Group name="https_cert" />
+    <Group name="nginx" />
     <Group name="git-main" />
   </Group>
 
@@ -643,6 +643,19 @@
     <Bundle name="php" />
   </Group>
 
+  <Group name="cgi">
+    <Bundle name="cgi"/>
+  </Group>
+
+  <Group name="git-main">
+    <Group name="gitweb"/>
+  </Group>
+
+  <Group name="gitweb">
+    <Bundle name="gitweb"/>
+    <Group name="cgi"/>
+  </Group>
+
   <Group name="ident-daemon">
     <Bundle name="identd"/>
   </Group>