diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py
index c006e24..2224521 100755
--- a/layerindex/tools/import_classic.py
+++ b/layerindex/tools/import_classic.py
@@ -116,9 +116,9 @@ def main():
         layer.summary = 'OE-Classic'
         layer.description = 'OpenEmbedded-Classic'
         layer.vcs_url =  'git://git.openembedded.org/openembedded'
-        layer.vcs_web_url = 'http://cgit.openembedded.org/cgit.cgi/openembedded'
-        layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/cgit.cgi/openembedded/tree/%path%'
-        layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/cgit.cgi/openembedded/tree/%path%'
+        layer.vcs_web_url = 'http://cgit.openembedded.org/openembedded'
+        layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%'
+        layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%'
         layer.classic = True
         layer.save()
 
diff --git a/layerindex/tools/import_layer.py b/layerindex/tools/import_layer.py
index 6e90a29..ad16e40 100755
--- a/layerindex/tools/import_layer.py
+++ b/layerindex/tools/import_layer.py
@@ -32,9 +32,9 @@ def set_vcs_fields(layer, repoval):
     layer.vcs_url = repoval
     if repoval.startswith('git://git.openembedded.org/'):
         reponame = re.sub('^.*/', '', repoval)
-        layer.vcs_web_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame
-        layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%'
-        layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%'
+        layer.vcs_web_url = 'http://cgit.openembedded.org/' + reponame
+        layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
+        layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
     elif 'git.yoctoproject.org/' in repoval:
         reponame = re.sub('^.*/', '', repoval)
         layer.vcs_web_url = 'http://git.yoctoproject.org/cgit/cgit.cgi/' + reponame
diff --git a/layerindex/tools/import_wiki_layers.py b/layerindex/tools/import_wiki_layers.py
index bcf57f3..7ada5f8 100755
--- a/layerindex/tools/import_wiki_layers.py
+++ b/layerindex/tools/import_wiki_layers.py
@@ -96,9 +96,9 @@ def main():
                         layer.vcs_url = repoval
                         if repoval.startswith('git://git.openembedded.org/'):
                             reponame = re.sub('^.*/', '', repoval)
-                            layer.vcs_web_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame
-                            layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%'
-                            layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%'
+                            layer.vcs_web_url = 'http://cgit.openembedded.org/' + reponame
+                            layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
+                            layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
                         elif 'git.yoctoproject.org/' in repoval:
                             reponame = re.sub('^.*/', '', repoval)
                             layer.vcs_web_url = 'http://git.yoctoproject.org/cgit/cgit.cgi/' + reponame
diff --git a/templates/layerindex/editlayer.html b/templates/layerindex/editlayer.html
index 161dcda..bd9a2a3 100644
--- a/templates/layerindex/editlayer.html
+++ b/templates/layerindex/editlayer.html
@@ -193,9 +193,9 @@
 
         if( repoval.startsWith('git://git.openembedded.org/') ) {
             reponame = repoval.replace(/^.*\//, '')
-            this.vcs_web_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame
-            this.vcs_web_tree_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%'
-            this.vcs_web_file_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%'
+            this.vcs_web_url = 'http://cgit.openembedded.org/' + reponame
+            this.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
+            this.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
             this.vcs_web_type = 'cgit'
         }
         else if( repoval.indexOf('git.yoctoproject.org/') > -1 ) {