diff --git a/pkgdef/chocolate-doom.sh b/pkgdef/chocolate-doom.sh
index 1dba20e..99dcc89 100644
--- a/pkgdef/chocolate-doom.sh
+++ b/pkgdef/chocolate-doom.sh
@@ -3,6 +3,7 @@ dependencies SDL2 SDL2_mixer SDL2_net
 variant stable fetch_download \
     https://www.chocolate-doom.org/downloads/3.0.1/chocolate-doom-3.0.1.tar.gz \
     d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7
-variant latest fetch_git \
-    https://github.com/chocolate-doom/chocolate-doom.git
+GIT_URL=https://github.com/chocolate-doom/chocolate-doom.git
+variant stable_git fetch_git $GIT_URL chocolate-doom-3.0.1
+variant latest fetch_git $GIT_URL
 build_autotools
diff --git a/pkgdef/flac.sh b/pkgdef/flac.sh
index 9098b8f..be658e3 100644
--- a/pkgdef/flac.sh
+++ b/pkgdef/flac.sh
@@ -4,7 +4,9 @@ check_pkgconfig flac
 # We use a repacked mirror since flac is released as .xz rather than .gz:
 variant stable fetch_download $CHOCPKG_MIRRORS/flac-1.3.1.tar.gz \
     4ae2c8ee48b3ae52635e543b1e64b58f5dcb8d69e1e18257da82f800cb754861
-variant latest fetch_git https://github.com/xiph/flac.git master
+GIT_URL=https://github.com/xiph/flac.git
+variant stable_git fetch_git $GIT_URL 1.3.1
+variant latest fetch_git $GIT_URL master
 
 # Compile problems :(
 build_autotools --disable-asm-optimizations --disable-cpplibs
diff --git a/pkgdef/fluidsynth.sh b/pkgdef/fluidsynth.sh
index 4366f06..814d71f 100644
--- a/pkgdef/fluidsynth.sh
+++ b/pkgdef/fluidsynth.sh
@@ -1,6 +1,9 @@
 description "Real-time sound font software synthesizer"
 check_pkgconfig fluidsynth
-fetch_download $CHOCPKG_MIRRORS/fluidsynth-1.1.6.tar.gz \
+variant stable fetch_download $CHOCPKG_MIRRORS/fluidsynth-1.1.6.tar.gz \
     50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c
+GIT_URL=https://github.com/FluidSynth/fluidsynth.git
+variant stable_git fetch_git $GIT_URL v1.1.6
+variant latest fetch_git $GIT_URL master
 dependencies glib
 build_autotools
diff --git a/pkgdef/gettext.sh b/pkgdef/gettext.sh
index a160bbf..7ee6c85 100644
--- a/pkgdef/gettext.sh
+++ b/pkgdef/gettext.sh
@@ -1,5 +1,9 @@
 description "gettext localization library"
 check_tool gettext
-fetch_download https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.7.tar.gz \
-               5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f
+variant stable fetch_download \
+    https://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.7.tar.gz \
+    5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f
+GIT_URL=https://git.savannah.gnu.org/git/gettext.git
+variant stable_git fetch_git $GIT_URL v0.19.7
+variant latest fetch_git $GIT_URL master
 build_autotools --disable-java
diff --git a/pkgdef/libffi.sh b/pkgdef/libffi.sh
index ca7dac8..27d221c 100644
--- a/pkgdef/libffi.sh
+++ b/pkgdef/libffi.sh
@@ -1,5 +1,9 @@
 description "Foreign function interface library"
 check_pkgconfig libffi
-fetch_download https://www.mirrorservice.org/sites/sourceware.org/pub/libffi/libffi-3.2.tar.gz \
-               6b2680fbf6ae9c2381d381248705857de22e05bae191889298f8e6bfb2ded4ef
+variant stable fetch_download \
+    https://www.mirrorservice.org/sites/sourceware.org/pub/libffi/libffi-3.2.tar.gz \
+    6b2680fbf6ae9c2381d381248705857de22e05bae191889298f8e6bfb2ded4ef
+GIT_URL=https://github.com/libffi/libffi.git
+variant stable_git fetch_git $GIT_URL v3.2
+variant latest fetch_git $GIT_URL master
 build_autotools
diff --git a/pkgdef/libogg.sh b/pkgdef/libogg.sh
index 5592ab7..3383761 100644
--- a/pkgdef/libogg.sh
+++ b/pkgdef/libogg.sh
@@ -3,5 +3,7 @@ check_pkgconfig ogg
 variant stable fetch_download \
     https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.2.tar.gz \
     e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692
-variant latest fetch_git https://github.com/xiph/ogg.git master
+GIT_URL=https://github.com/xiph/ogg.git
+variant stable_git fetch_git $GIT_URL v1.3.2
+variant latest fetch_git $GIT_URL master
 build_autotools
diff --git a/pkgdef/libpng.sh b/pkgdef/libpng.sh
index 3cf7aab..5787744 100644
--- a/pkgdef/libpng.sh
+++ b/pkgdef/libpng.sh
@@ -4,5 +4,7 @@ check_pkgconfig libpng
 # We maintain a mirror since libpng is only downloadable via Sourceforge:
 variant stable fetch_download $CHOCPKG_MIRRORS/libpng-1.6.10.tar.gz \
     b0206a22b49c91fc5521b2cfb1c251433a37aed0a645bc504ab3d061f27e4d51
-variant latest fetch_git https://github.com/glennrp/libpng.git libpng16
+GIT_URL=https://github.com/glennrp/libpng.git
+variant latest fetch_git $GIT_URL libpng16
+variant stable_git fetch_git $GIT_URL v1.6.10
 build_autotools
diff --git a/pkgdef/libsamplerate.sh b/pkgdef/libsamplerate.sh
index fab03c1..e176725 100644
--- a/pkgdef/libsamplerate.sh
+++ b/pkgdef/libsamplerate.sh
@@ -1,5 +1,9 @@
 description "Library for high quality audio resampling"
 check_pkgconfig samplerate
-fetch_download http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz \
-               93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06
+variant stable fetch_download \
+    http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz \
+    93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06
+GIT_URL=https://github.com/libsndfile/libsamplerate.git
+variant stable_git fetch_git $GIT_URL 0.1.9
+variant latest fetch_git $GIT_URL master
 build_autotools
diff --git a/pkgdef/libtool.sh b/pkgdef/libtool.sh
index 64b2145..8134f1d 100644
--- a/pkgdef/libtool.sh
+++ b/pkgdef/libtool.sh
@@ -1,5 +1,9 @@
 description "Library compilation support script"
 check_tool libtool
-fetch_download https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz \
-               e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
+variant stable fetch_download \
+    https://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz \
+    e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3
+GIT_URL=https://git.savannah.gnu.org/git/libtool.git
+variant stable_git fetch_git $GIT_URL v2.4.6
+variant latest fetch_git $GIT_URL master
 build_autotools
diff --git a/pkgdef/libvorbis.sh b/pkgdef/libvorbis.sh
index a516dfc..4b452e5 100644
--- a/pkgdef/libvorbis.sh
+++ b/pkgdef/libvorbis.sh
@@ -1,7 +1,10 @@
 description "Library for decoding Ogg Vorbis codec files"
 dependencies libogg
 check_pkgconfig vorbis
-fetch_download \
+variant stable fetch_download \
     https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.5.tar.gz \
     6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce
+GIT_URL=https://github.com/xiph/vorbis.git
+variant stable_git fetch_git $GIT_URL v1.3.5
+variant latest fetch_git $GIT_URL master
 build_autotools
diff --git a/pkgdef/zlib.sh b/pkgdef/zlib.sh
index ff7705f..8fa8bc1 100644
--- a/pkgdef/zlib.sh
+++ b/pkgdef/zlib.sh
@@ -2,7 +2,9 @@ description "Library for compressing/decompressing GZIP files"
 check_pkgconfig zlib
 variant stable fetch_download http://www.zlib.net/fossils/zlib-1.2.11.tar.gz \
                c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-variant latest fetch_git https://github.com/madler/zlib.git master
+GIT_URL=https://github.com/madler/zlib.git
+variant stable_git fetch_git $GIT_URL v1.2.11
+variant latest fetch_git $GIT_URL master
 build_autotools
 
 # zlib's configure script is hand-rolled and doesn't support the normal