diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py
index 61665369fbe310a126f2c64e9af0afa7350928fb..2f80cc0a3eda43623afd6f60a7f9b005a820beee 100755
--- a/advisors/check_upstream.py
+++ b/advisors/check_upstream.py
@@ -486,7 +486,7 @@ def check_sourceforge(info, clean_tag=True):
             for tag_info in tag_infos:
                 if filter_condition in tag_info:
                     tag = tag_info.strip()
-                    tag = tag.lstrip(filter_condition)
+                    tag = tag.replace(filter_condition,"")
                     tag = tag.strip("/download\"")
                     tags.append(tag)
     if clean_tag:
diff --git a/upstream-info/CUnit.yaml b/upstream-info/CUnit.yaml
index 51566b43fe8e51419c2a7c6160fcc09e605e9917..4c1320e58780105e8f7c33a162a08055b7c8221d 100644
--- a/upstream-info/CUnit.yaml
+++ b/upstream-info/CUnit.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: svn
-src_repo: http://svn.code.sf.net/p/cunit/code
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/cunit/files/CUnit
 tag_prefix: 
-separator: 
+separator: "-"
diff --git a/upstream-info/docbook2X.yaml b/upstream-info/docbook2X.yaml
index 38363328631f789a2c430d3ca1f6620ef6ecdc9e..574c807d75e471269ec27a75253fea560e90089a 100644
--- a/upstream-info/docbook2X.yaml
+++ b/upstream-info/docbook2X.yaml
@@ -1,7 +1,5 @@
 ---
-version_control: github
-src_repo: Distrotech/docbook2X
-tag_prefix: "^"
-separator: "."
-git_url: https://github.com/Distrotech/docbook2X.git
-git_tag:
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/docbook2x/files/docbook2x
+tag_prefix: 
+separator: .
diff --git a/upstream-info/freeimage.yaml b/upstream-info/freeimage.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..06ce27b3d770bd7f841115282df5e691f712bfef
--- /dev/null
+++ b/upstream-info/freeimage.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/freeimage/files/Source%20Distribution
+tag_prefix: 
+separator: .
diff --git a/upstream-info/gavl.yaml b/upstream-info/gavl.yaml
index a94f365e097146902e991cc3cff8d238bc46b25a..941bca8b54dba12b49acad7a5aa43dd50db48c0d 100644
--- a/upstream-info/gavl.yaml
+++ b/upstream-info/gavl.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/gmerlin/code
-tag_prefix: "^"
-separator: "."
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/gmerlin/files/gavl
+tag_prefix:
+separator: .
diff --git a/upstream-info/mcpp.yaml b/upstream-info/mcpp.yaml
index 2d991483ece8caa2e1c6720faf33af04e41584e8..b6be51d1bf4168335831ba890ecc594abbe557a7 100644
--- a/upstream-info/mcpp.yaml
+++ b/upstream-info/mcpp.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/mcpp/code
-tag_prefix: "^V"
-separator: "."
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/mcpp/files/mcpp
+tag_prefix: ^V.
+separator: .
diff --git a/upstream-info/mtx.yaml b/upstream-info/mtx.yaml
index 48d790b79819f2a4e6561a739cd6bed42204bd70..8ad5a88004281565dc86b083caf50d5381385365 100644
--- a/upstream-info/mtx.yaml
+++ b/upstream-info/mtx.yaml
@@ -1,5 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/mtx/code
-tag_prefix: "^v"
-separator: _
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/mtx/files/mtx-stable
+tag_prefix: 
+separator: .
diff --git a/upstream-info/net-tools.yaml b/upstream-info/net-tools.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..266617892de08df65ecb993fd562d19eb90bffdf
--- /dev/null
+++ b/upstream-info/net-tools.yaml
@@ -0,0 +1,5 @@
+---
+version_control: git
+src_repo: https://git.code.sf.net/p/net-tools/code
+tag_prefix: ^v
+separator: .
diff --git a/upstream-info/qrupdate.yaml b/upstream-info/qrupdate.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4ea61ab670d0787d138d45dfe2c64e2f850cfdbc
--- /dev/null
+++ b/upstream-info/qrupdate.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/qrupdate/files/qrupdate
+tag_prefix: 
+separator: .
diff --git a/upstream-info/sblim-cmpi-devel.yaml b/upstream-info/sblim-cmpi-devel.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..52b7d96d07024ba6a6708f47d0a76ec7982d6a61
--- /dev/null
+++ b/upstream-info/sblim-cmpi-devel.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/sblim/files/development%20pkgs/sblim-cmpi-devel
+tag_prefix: 
+separator: .
diff --git a/upstream-info/sendmail.yaml b/upstream-info/sendmail.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3849b506b902c0c3fc21cbc5756fb6016a8deaae
--- /dev/null
+++ b/upstream-info/sendmail.yaml
@@ -0,0 +1,5 @@
+---
+version_control: ftp
+src_repo: http://ftp.sendmail.org/
+tag_pattern: "sendmail.(.*).tar.gz(.sig)?"
+separator: "." 
diff --git a/upstream-info/setserial.yaml b/upstream-info/setserial.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7befb6093a699f12ddf0ee9fede299ab346a54ec
--- /dev/null
+++ b/upstream-info/setserial.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/setserial/files/setserial
+tag_prefix: 
+separator: .
diff --git a/upstream-info/tix.yaml b/upstream-info/tix.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5f06d781d16bede22fc82abdc1103322725e6a86
--- /dev/null
+++ b/upstream-info/tix.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/tix/files/tix
+tag_prefix: 
+separator: .
diff --git a/upstream-info/traceroute.yaml b/upstream-info/traceroute.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1e06177f87ccc30b1c24f465475a41492f358aad
--- /dev/null
+++ b/upstream-info/traceroute.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/traceroute/files/traceroute/
+tag_prefix: "-"
+separator: .
diff --git a/upstream-info/xmlrpc-c.yaml b/upstream-info/xmlrpc-c.yaml
index d34e785fb55e6b2e8cfd20aa7e5341e0690477bc..30fac2b231afd70fd10ab193772e809283f72763 100644
--- a/upstream-info/xmlrpc-c.yaml
+++ b/upstream-info/xmlrpc-c.yaml
@@ -1,6 +1,5 @@
 ---
-version_control: svn
-src_repo: https://svn.code.sf.net/p/xmlrpc-c/code
-tag_dir: release_number
-tag_prefix: ''
-separator: "."
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/xmlrpc-c/files/Xmlrpc-c%20Super%20Stable
+tag_prefix: 
+separator: .
diff --git a/upstream-info/zd1211-firmware.yaml b/upstream-info/zd1211-firmware.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b1e0bbe9e326b31cd11c5a1afc41f232fdbcaac3
--- /dev/null
+++ b/upstream-info/zd1211-firmware.yaml
@@ -0,0 +1,5 @@
+---
+version_control: sourceforge
+src_repo: https://sourceforge.net/projects/zd1211/files/zd1211-firmware
+tag_prefix: 
+separator: