diff --git a/CHANGES b/CHANGES
index 86f81dd..99cdb60 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,11 @@ History
 0.1.3
 -----
 
+* Added checking out of tagged releases of the upstream scripts.
+    - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
+* Added loose distribution checking so it should now work with Linux Mint and
+  other Ubuntu derivatives.
+    - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
 * Added the creation of a local 'apt' repository
 * Removed installation of Java packages, you can now use 'apt-get' yourself
 * Updated documentation
diff --git a/README b/README
index 091ca94..4aad57a 100644
--- a/README
+++ b/README
@@ -77,6 +77,11 @@ History
 0.1.3
 -----
 
+* Added checking out of tagged releases of the upstream scripts.
+    - Closes : https://github.com/flexiondotorg/oab-java6/issues/1
+* Added loose distribution checking so it should now work with Linux Mint and
+  other Ubuntu derivatives.
+    - Closes : https://github.com/flexiondotorg/oab-java6/issues/2
 * Added the creation of a local 'apt' repository
 * Removed installation of Java packages, you can now use 'apt-get' yourself
 * Updated documentation
diff --git a/oab-java6.sh b/oab-java6.sh
index 41f32b0..675a514 100755
--- a/oab-java6.sh
+++ b/oab-java6.sh
@@ -174,8 +174,7 @@ fi
 # Check we are running on a supported system in the correct way.
 check_root
 check_sudo
-check_ubuntu "lucid maverick natty oneiric precise"
-lsb
+check_ubuntu "all"
 
 # Parse the options
 OPTSTRING=bh
@@ -220,12 +219,20 @@ ncecho " [x] Removing clones of https://github.com/rraptorr/sun-java6 "
 rm -rfv /var/local/oab/sun-java6*-${JAVA_VER}.${JAVA_UPD} 2>/dev/null >> "$log" 2>&1 &
 pid=$!;progress $pid
 
-# Checkout the code
+# Clone the code
 ncecho " [x] Cloning https://github.com/rraptorr/sun-java6 "
 cd /var/local/oab/ >> "$log" 2>&1
 git clone git://github.com/rraptorr/sun-java6.git sun-java6-${JAVA_VER}.${JAVA_UPD} >> "$log" 2>&1 &
 pid=$!;progress $pid
 
+# Checkout the latest tagged release
+cd /var/local/oab/sun-java6-${JAVA_VER}.${JAVA_UPD} >> "$log" 2>&1
+TAG=`git tag -l v${JAVA_VER}.${JAVA_UPD}-* | tail -n1`
+
+ncecho " [x] Checking out ${TAG} "
+git checkout ${TAG} >> "$log" 2>&1 &
+pid=$!;progress $pid
+
 # Download the Oracle install packages.
 for JAVA_PLAT in i586 x64
 do