diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template
index 4de01e99fa..faf31a20e9 100644
--- a/srcpkgs/catalyst/template
+++ b/srcpkgs/catalyst/template
@@ -18,6 +18,7 @@ short_desc="${_desc} - Libraries and Utilities"
 nonfree=yes
 create_wrksrc=yes
 
+update_pkgname="fglrx-installer"
 distfiles="http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_${version}.orig.tar.gz"
 checksum=b9064fb5e15c0094162c18d0db9135c061d0e1fde31b2e63de5d3cd455a19e40
 
diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template
index 76c6a30324..c7a9ffc17d 100644
--- a/srcpkgs/cdparanoia/template
+++ b/srcpkgs/cdparanoia/template
@@ -7,6 +7,8 @@ hostmakedepends="libtool automake"
 build_style=gnu-configure
 short_desc="CDDA reading utility with extra data verification features"
 homepage="https://www.xiph.org/paranoia/"
+update_pkgname="cdparanoia-III"
+update_ignore="alpha* *pre*"
 license="GPL-2"
 maintainer="Juan RP <xtraeme@gmail.com>"
 distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz"
diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template
index 1c0576549f..a5a0a87615 100644
--- a/srcpkgs/cdrtools/template
+++ b/srcpkgs/cdrtools/template
@@ -11,7 +11,7 @@ short_desc="Highly portable CD/DVD/BluRay command line recording software"
 homepage="http://cdrecord.org/"
 license="CDDL"
 maintainer="Juan RP <xtraeme@gmail.com>"
-distfiles="http://ftp.gwdg.de/linux/cdrecord/cdrtools-3.00.tar.bz2"
+distfiles="ftp://ftp.gwdg.de/linux/cdrecord/cdrtools-3.00.tar.bz2"
 checksum=7f9cb64820055573b880f77b2f16662a512518336ba95ab49228a1617973423d
 
 post_install() {
diff --git a/srcpkgs/celestia-glut/template b/srcpkgs/celestia-glut/template
index 60f3cd9a2e..a54f384f13 100644
--- a/srcpkgs/celestia-glut/template
+++ b/srcpkgs/celestia-glut/template
@@ -6,6 +6,8 @@ short_desc="free space simulation using GLUT"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2"
 homepage="http://www.shatters.net/celestia/"
+update_pkgname="celestia"
+update_ignore="103 104 107"
 distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz"
 checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4"
 build_style=gnu-configure
diff --git a/srcpkgs/celestia-gtk/template b/srcpkgs/celestia-gtk/template
index 643e7117c0..dda209d9ba 100644
--- a/srcpkgs/celestia-gtk/template
+++ b/srcpkgs/celestia-gtk/template
@@ -6,6 +6,8 @@ short_desc="free space simulation using GTK"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2"
 homepage="http://www.shatters.net/celestia/"
+update_pkgname="celestia"
+update_ignore="103 104 107"
 distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz"
 checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4"
 build_style=gnu-configure
diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template
index 44705ffdaf..d326d92466 100644
--- a/srcpkgs/cinnamon-control-center/template
+++ b/srcpkgs/cinnamon-control-center/template
@@ -18,6 +18,8 @@ depends="lib${sourcepkg}>=${version}_${revision} GConf cinnamon-settings-daemon
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 build_options="systemd"
 
diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template
index c0541121ac..43b327e163 100644
--- a/srcpkgs/cinnamon-desktop/template
+++ b/srcpkgs/cinnamon-desktop/template
@@ -12,6 +12,8 @@ depends="xkeyboard-config"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 do_fetch() {
 	git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
diff --git a/srcpkgs/cinnamon-menus/template b/srcpkgs/cinnamon-menus/template
index c725c73376..19be91bebe 100644
--- a/srcpkgs/cinnamon-menus/template
+++ b/srcpkgs/cinnamon-menus/template
@@ -10,6 +10,8 @@ makedepends="glib-devel gnome-common gobject-introspection"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 do_fetch() {
 	git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template
index b221369172..e1deef3ec5 100644
--- a/srcpkgs/cinnamon-screensaver/template
+++ b/srcpkgs/cinnamon-screensaver/template
@@ -16,6 +16,8 @@ conf_files="/etc/pam.d/${pkgname}"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 build_options="systemd"
 
diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template
index 7e54e7b669..6c907958b9 100644
--- a/srcpkgs/cinnamon-session/template
+++ b/srcpkgs/cinnamon-session/template
@@ -15,6 +15,8 @@ depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 build_options="systemd"
 
diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template
index 79b0ec8414..b4eb66ec73 100644
--- a/srcpkgs/cinnamon-settings-daemon/template
+++ b/srcpkgs/cinnamon-settings-daemon/template
@@ -17,6 +17,8 @@ depends="desktop-file-utils hicolor-icon-theme"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 build_options="systemd"
 
diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template
index a844c48d0d..8a4adae2c1 100644
--- a/srcpkgs/cinnamon-translations/template
+++ b/srcpkgs/cinnamon-translations/template
@@ -8,6 +8,8 @@ short_desc="Translations for Cinnamon and Nemo"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 do_fetch() {
 	git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template
index 7e0a7b3300..d6e1fffb7b 100644
--- a/srcpkgs/cinnamon/template
+++ b/srcpkgs/cinnamon/template
@@ -22,6 +22,8 @@ depends="
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/Cinnamon/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 do_fetch() {
 	git clone -b ${version} git://github.com/linuxmint/Cinnamon ${pkgname}-${version}
diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template
index 4e61b14a1b..5b8f299bb0 100644
--- a/srcpkgs/cjs/template
+++ b/srcpkgs/cjs/template
@@ -10,6 +10,8 @@ makedepends="js-devel dbus-glib-devel readline-devel>=6.3"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://cinnamon.linuxmint.com/"
+update_site="https://api.github.com/repos/linuxmint/$pkgname/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 do_fetch() {
 	git clone -b ${version} git://github.com/linuxmint/${pkgname} ${pkgname}-${version}
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 07bad4cfc3..fba44e7640 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -13,6 +13,7 @@ short_desc="Cross-platform, open-source build system - QT GUI"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1, 3-clause-BSD"
 homepage="http://www.cmake.org"
+update_pkgname="cmake"
 distfiles="http://www.cmake.org/files/v${version%.*}/cmake-$version.tar.gz"
 checksum=ea11a8fb6679496de4e198ab93007968faa638663691cdf731ae2d4ed74e00c2
 
diff --git a/srcpkgs/cmuclmtk/template b/srcpkgs/cmuclmtk/template
index 7c4e69c0e7..9cb7da9b1f 100644
--- a/srcpkgs/cmuclmtk/template
+++ b/srcpkgs/cmuclmtk/template
@@ -6,7 +6,7 @@ short_desc="Language model tools for Sphinx"
 maintainer="Martin Riese <grauehaare@gmx.de>"
 license="GPL-2"
 homepage="http://cmusphinx.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/project/cmusphinx/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/cmusphinx/${pkgname}/${version}/${pkgname}-${version}.tar.gz"
 checksum="d23e47f00224667c059d69ac942f15dc3d4c3dd40e827318a6213699b7fa2915"
 build_style=gnu-configure
 configure_args="--disable-static"
diff --git a/srcpkgs/cntlm/template b/srcpkgs/cntlm/template
index 6f80dc7b95..1921b22980 100644
--- a/srcpkgs/cntlm/template
+++ b/srcpkgs/cntlm/template
@@ -9,7 +9,7 @@ short_desc="NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
 license="GPL-2"
 homepage="http://cntlm.sourceforge.net/"
-distfiles="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname%20$version/$pkgname-$version.tar.gz"
+distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=9c3ad10924d43f7248df9ecd33cbc033afbd7ea8d9545de0d68a2782fed76298
 
 do_build() {
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
index 5560487f06..33cfa53d05 100644
--- a/srcpkgs/conky-cli/template
+++ b/srcpkgs/conky-cli/template
@@ -16,6 +16,7 @@ short_desc="Conky command line without X11"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
 license="BSD, GPL"
 homepage="http://conky.sourceforge.net/"
+update_pkgname="conky"
 distfiles="${SOURCEFORGE_SITE}/${pkgname/-cli/}/${pkgname/-cli/}-${version}.tar.gz"
 checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca
 
diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template
index 24fd38f22e..dd0a722ef9 100644
--- a/srcpkgs/cppcheck/template
+++ b/srcpkgs/cppcheck/template
@@ -7,6 +7,8 @@ short_desc="Static analysis of C/C++ code"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
 homepage="http://cppcheck.sourceforge.net"
+update_site="https://api.github.com/repos/danmar/cppcheck/tags"
+update_pattern='"name":\s*"\K[^\d]*([\d\.]+)(?=")'
 
 do_fetch() {
 	git clone -b ${version} git://github.com/danmar/cppcheck ${pkgname}-${version}
diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template
index cd3c628d97..b5f919438a 100644
--- a/srcpkgs/cvs2svn/template
+++ b/srcpkgs/cvs2svn/template
@@ -15,6 +15,7 @@ depends="cvs python"
 short_desc="CVS to Subversion, git and bazaar repository conversion tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://cvs2svn.tigris.org/"
+update_site="http://cvs2svn.tigris.org/servlets/ProjectDocumentList?folderID=2976"
 license="BSD"
 distfiles="http://cvs2svn.tigris.org/files/documents/1462/46528/cvs2svn-${version}.tar.gz"
 checksum=d9d835e0c7df48966fbadf51527c25ebf1343b25179e3802f4637d4b96ba363e