diff --git a/upstream-info/arquillian-core.yaml b/upstream-info/arquillian-core.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fdbcb88d7de5ebeb689fc6dfa3d6b367c628e4ad
--- /dev/null
+++ b/upstream-info/arquillian-core.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: arquillian/arquillian-core
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/eclipse-ecf.yaml b/upstream-info/eclipse-ecf.yaml
index 7456cf0c8e509719e422e4494c9b90542949f2fd..ebe951b62cd2eff6d0d55c59512246f779e27d35 100644
--- a/upstream-info/eclipse-ecf.yaml
+++ b/upstream-info/eclipse-ecf.yaml
@@ -1,4 +1,4 @@
 version_control: git
-src_repo: http://git.eclipse.org/r/ecf/org.eclipse.ecf.git
-tag_prefix: "ECF_"
-separator: "_"
+src_repo: https://git.eclipse.org/r/ecf/org.eclipse.ecf.git
+tag_pattern: ECF_(.*)_Release
+separator: _
diff --git a/upstream-info/eclipse-emf.yaml b/upstream-info/eclipse-emf.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..135b472b1298449104996e8171439d220ceb84b1
--- /dev/null
+++ b/upstream-info/eclipse-emf.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/emf/org.eclipse.emf.git
+tag_prefix: R
+separator: _
diff --git a/upstream-info/eclipse-license.yaml b/upstream-info/eclipse-license.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4fdefb7282eb423493e452ffdf96cf28c71e3949
--- /dev/null
+++ b/upstream-info/eclipse-license.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/cbi/org.eclipse.license.git
+tag_pattern: license-(.*).*-*
+separator: .
diff --git a/upstream-info/jackson-dataformat-xml.yaml b/upstream-info/jackson-dataformat-xml.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4fee9111314aeed40df6178d0ecce3802a927740
--- /dev/null
+++ b/upstream-info/jackson-dataformat-xml.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: FasterXML/jackson-dataformat-xml
+tag_pattern: jackson-dataformat-xml-(.*)(-rc*)?
+separator: .
diff --git a/upstream-info/jboss-connector-1.7-api.yaml b/upstream-info/jboss-connector-1.7-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..797e494393447f404ca501071a2671e8c6680756
--- /dev/null
+++ b/upstream-info/jboss-connector-1.7-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-connector-api_spec
+tag_pattern: jboss-connector-api_1.7_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jboss-ejb-3.1-api.yaml b/upstream-info/jboss-ejb-3.1-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2126ea41929de49c70dbc358382d767de556bc6b
--- /dev/null
+++ b/upstream-info/jboss-ejb-3.1-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-ejb-api_spec
+tag_pattern: jboss-ejb-api_3.1_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jboss-el-2.2-api.yaml b/upstream-info/jboss-el-2.2-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6f4d24cd06c22e85be28979b03b03ceed9698d54
--- /dev/null
+++ b/upstream-info/jboss-el-2.2-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-el-api_spec
+tag_pattern: jboss-el-api_2.2_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jboss-interceptors-1.1-api.yaml b/upstream-info/jboss-interceptors-1.1-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c5dce0256d6d39bd8467c5788999dcd48f5fcba0
--- /dev/null
+++ b/upstream-info/jboss-interceptors-1.1-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-interceptors-api_spec
+tag_pattern: jboss-interceptors-api_1.1_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jboss-jaxrpc-1.1-api.yaml b/upstream-info/jboss-jaxrpc-1.1-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8d88563919495bc4a0b585afa7b66add2fb477b9
--- /dev/null
+++ b/upstream-info/jboss-jaxrpc-1.1-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-jaxrpc-api_spec
+tag_pattern: jboss-jaxrpc-api_1.1_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jboss-logging-tools1.yaml b/upstream-info/jboss-logging-tools1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a99fd6706d27bd7f2123723bf45ed7b4240fcbc6
--- /dev/null
+++ b/upstream-info/jboss-logging-tools1.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss-logging/jboss-logging-tools
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/jboss-logmanager.yaml b/upstream-info/jboss-logmanager.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..503c7b763dd789500e7f61f37d054567ee90f507
--- /dev/null
+++ b/upstream-info/jboss-logmanager.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss-logging/jboss-logmanager
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/jboss-modules.yaml b/upstream-info/jboss-modules.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d07342bd8c9c8ff7cac6ff5061e8af9c5a1aa709
--- /dev/null
+++ b/upstream-info/jboss-modules.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss-modules/jboss-modules
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/jboss-servlet-2.5-api.yaml b/upstream-info/jboss-servlet-2.5-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e074ccf94de11eb798678d96ad66c39a9b8a40ac
--- /dev/null
+++ b/upstream-info/jboss-servlet-2.5-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-servlet-api_spec
+tag_pattern: jboss-servlet-api_2.5_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jboss-transaction-1.1-api.yaml b/upstream-info/jboss-transaction-1.1-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c49abc98a631046f0051018dbb8d78b5efa8cbb4
--- /dev/null
+++ b/upstream-info/jboss-transaction-1.1-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jboss/jboss-transaction-api_spec
+tag_pattern: jboss-transaction-api_1.1_spec-(.*).Final
+separator: .
diff --git a/upstream-info/jetty-alpn-api.yaml b/upstream-info/jetty-alpn-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c5a25f3c9e8d57dcf09b084a026ed45999c74c78
--- /dev/null
+++ b/upstream-info/jetty-alpn-api.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/jetty/org.eclipse.jetty.alpn.git
+tag_pattern: alpn-api-(.*)v*
+separator: .
diff --git a/upstream-info/jetty-artifact-remote-resources.yaml b/upstream-info/jetty-artifact-remote-resources.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8df719e8fefe5d09fa52221c8c491574b823b3df
--- /dev/null
+++ b/upstream-info/jetty-artifact-remote-resources.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/jetty/org.eclipse.jetty.toolchain.git
+tag_prefix: jetty-artifact-remote-resources-
+separator: .
diff --git a/upstream-info/jetty-assembly-descriptors.yaml b/upstream-info/jetty-assembly-descriptors.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81aae4e2f0593f6521e4eb5a1da3a7b18060f823
--- /dev/null
+++ b/upstream-info/jetty-assembly-descriptors.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/jetty/org.eclipse.jetty.toolchain.git
+tag_prefix: jetty-assembly-descriptors-
+separator: .
diff --git a/upstream-info/jetty-build-support.yaml b/upstream-info/jetty-build-support.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5659cab50165c8a892479c9927845a85fabacb92
--- /dev/null
+++ b/upstream-info/jetty-build-support.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/jetty/org.eclipse.jetty.toolchain.git
+tag_prefix: jetty-build-support-
+separator: .
diff --git a/upstream-info/jetty-distribution-remote-resources.yaml b/upstream-info/jetty-distribution-remote-resources.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..29331e95409e3fcdf64927eb4e97e405499f24fc
--- /dev/null
+++ b/upstream-info/jetty-distribution-remote-resources.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/jetty/org.eclipse.jetty.toolchain.git
+tag_prefix: jetty-distribution-remote-resources-
+separator: .
diff --git a/upstream-info/jetty8.yaml b/upstream-info/jetty8.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7650d7ff5a51ec6cb1ef5283d18c11f335db741b
--- /dev/null
+++ b/upstream-info/jetty8.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/jetty/org.eclipse.jetty.project.git
+tag_pattern: jetty-(.*).v*
+separator: .
diff --git a/upstream-info/jibx.yaml b/upstream-info/jibx.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..79645a3347cce760d4eb163069d56ec1cd5010df
--- /dev/null
+++ b/upstream-info/jibx.yaml
@@ -0,0 +1,4 @@
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/jibx/files/jibx
+tag_prefix: jibx-
+separator: .
diff --git a/upstream-info/maildrop.yaml b/upstream-info/maildrop.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..96ce9d88e2ace8708e3a86772e0ae066ffb4f78c
--- /dev/null
+++ b/upstream-info/maildrop.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: superfell/maildrop
+tag_prefix: ^v
+separator: .
diff --git a/upstream-info/nethogs.yaml b/upstream-info/nethogs.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..cf71472038e275d32c926c689b505f75455293b6
--- /dev/null
+++ b/upstream-info/nethogs.yaml
@@ -0,0 +1,5 @@
+---
+version_control: github
+src_repo: raboof/nethogs
+tag_prefix: "^v"
+separator: "."
diff --git a/upstream-info/os-maven-plugin.yaml b/upstream-info/os-maven-plugin.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d3f386a573edc0153c8e2ec6196296478a3ae57e
--- /dev/null
+++ b/upstream-info/os-maven-plugin.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: trustin/os-maven-plugin
+tag_pattern: os-maven-plugin-(.*).Final
+separator: .
diff --git a/upstream-info/python-requests-toolbelt.yaml b/upstream-info/python-requests-toolbelt.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..59a8794e0e89fea70f1199bb312e94ab0b6dad3f
--- /dev/null
+++ b/upstream-info/python-requests-toolbelt.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: requests/toolbelt
+tag_prefix:
+separator: .
diff --git a/upstream-info/resteasy.yaml b/upstream-info/resteasy.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dc0ee332406476256f5139104e1c42e34d53613a
--- /dev/null
+++ b/upstream-info/resteasy.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: resteasy/Resteasy
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/simple.yaml b/upstream-info/simple.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4b9a91c52b2828c38ccf4749188fff23efcfcc98
--- /dev/null
+++ b/upstream-info/simple.yaml
@@ -0,0 +1,4 @@
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/simpleweb/files/simpleweb
+tag_prefix: 
+separator: .
diff --git a/upstream-info/sisu-mojos.yaml b/upstream-info/sisu-mojos.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ca405e801fbb0e78f4ff51b937c9fe0951e4b539
--- /dev/null
+++ b/upstream-info/sisu-mojos.yaml
@@ -0,0 +1,4 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/sisu/org.eclipse.sisu.mojos.git
+tag_prefix: ^releases/
+separator: .
diff --git a/upstream-info/staxmapper.yaml b/upstream-info/staxmapper.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ded69f02c419eb683eab0f02fddb803f29e79cfe
--- /dev/null
+++ b/upstream-info/staxmapper.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: jbossas/staxmapper
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/takari-lifecycle.yaml b/upstream-info/takari-lifecycle.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..15479be785f342946ac3a923d90a6d44806b0441
--- /dev/null
+++ b/upstream-info/takari-lifecycle.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: takari/takari-lifecycle
+tag_prefix: takari-lifecycle-
+separator: .
diff --git a/upstream-info/takari-plugin-testing.yaml b/upstream-info/takari-plugin-testing.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..bf2110f0be9f4c3ef285d6a638fd7c84ecbe99a2
--- /dev/null
+++ b/upstream-info/takari-plugin-testing.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: takari/takari-plugin-testing-project
+tag_prefix: takari-plugin-testing-
+separator: .
diff --git a/upstream-info/takari-pom.yaml b/upstream-info/takari-pom.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..29ecdd32fdad33dd26cf491a09b43dc82cbdd2b9
--- /dev/null
+++ b/upstream-info/takari-pom.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: takari/takari-pom
+tag_prefix: takari-
+separator: .
diff --git a/upstream-info/traceroute.yaml b/upstream-info/traceroute.yaml
index 1e06177f87ccc30b1c24f465475a41492f358aad..fa9acc29e2720bfb59ec9492bd3f5ea6859fa842 100644
--- a/upstream-info/traceroute.yaml
+++ b/upstream-info/traceroute.yaml
@@ -1,5 +1,5 @@
 ---
 version_control: sourceforge
 src_repo: https://sourceforge.net/projects/traceroute/files/traceroute/
-tag_prefix: "-"
+tag_prefix: "traceroute-"
 separator: .
diff --git a/upstream-info/undertow.yaml b/upstream-info/undertow.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ca94135c6c8baff9d8d47f0ea8d08deb7f016198
--- /dev/null
+++ b/upstream-info/undertow.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: undertow-io/undertow
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/weld-api.yaml b/upstream-info/weld-api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..079e8831309c42f3633ed34106e735245e9afbd7
--- /dev/null
+++ b/upstream-info/weld-api.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: weld/api
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/weld-core.yaml b/upstream-info/weld-core.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e13ed494e593015f2398e8fcfded1ba054ca3671
--- /dev/null
+++ b/upstream-info/weld-core.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: weld/core
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/wildfly-build-tools.yaml b/upstream-info/wildfly-build-tools.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4b9cb98bd5264d551abf00002be3b56232ef2a6e
--- /dev/null
+++ b/upstream-info/wildfly-build-tools.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: wildfly/wildfly-build-tools
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/wildfly-core.yaml b/upstream-info/wildfly-core.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..916190fa170f99c525bd28a6ff0d9ad425f59b6e
--- /dev/null
+++ b/upstream-info/wildfly-core.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: wildfly/wildfly-core
+tag_pattern: (.*).Final
+separator: . 
diff --git a/upstream-info/wildfly-elytron.yaml b/upstream-info/wildfly-elytron.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..54f5966682f3cb2bd41c1efe0fc6287df87da857
--- /dev/null
+++ b/upstream-info/wildfly-elytron.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: wildfly-security/wildfly-elytron-tool
+tag_pattern: (.*).Final
+separator: .
diff --git a/upstream-info/wildfly-security-manager.yaml b/upstream-info/wildfly-security-manager.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..aba6de0114c4673f8a7da341a1b5ed2dcd137643
--- /dev/null
+++ b/upstream-info/wildfly-security-manager.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: wildfly-security/security-manager
+tag_pattern: (.*).Final
+separator: .