diff --git a/webbuild/html/scripts/webbuild.js b/webbuild/html/scripts/webbuild.js
index 049578c..2ec2ce4 100644
--- a/webbuild/html/scripts/webbuild.js
+++ b/webbuild/html/scripts/webbuild.js
@@ -43,9 +43,18 @@ function suggestSpecName(url) {
           e != ".orig") break;
       specname=specname.substring(0,i);
    }
+   i=specname.lastIndexOf('_');
+   e=specname.substring(i);
+   if (e == "_src" || e == "_orig") specname=specname.substring(0,i);
+   i=specname.lastIndexOf('-');
+   e=specname.substring(i);
+   if (e == "-src" || e == "-orig") specname=specname.substring(0,i);
    if (specname.lastIndexOf('-') > 0) {
       version=specname.substring(specname.lastIndexOf('-')+1);
       specname=specname.substring(0,specname.lastIndexOf('-'));
+   } else if (specname.lastIndexOf('_') > 0) {
+      version=specname.substring(specname.lastIndexOf('_')+1);
+      specname=specname.substring(0,specname.lastIndexOf('_'));
    }
    document.getElementById("speccreateurl").value=url;
    if (url.search("cpan.org") >= 0) {