diff --git a/.gitignore b/.gitignore
index 8d974ec..1c925c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ src/**/*.log
 aur
 broke
 .SRCINFO
+build_single_nofail.sh
diff --git a/arch-ppa b/arch-ppa
index 6990045..63f331c 100755
--- a/arch-ppa
+++ b/arch-ppa
@@ -260,16 +260,42 @@ build() {
 
 rebuild() {
 		(
-		set -e
-		setup
-		repo_name=$1
+	set -e
+	if [ "$#" -lt 1 ]; then
+	    echo "Must specify repository name to build (and optional package list to include)"
+	    return 1
+	fi
+	setup
+	repo_name=$1
 		mkdir -p $basedir/$repo_name
 		shift
-		arch-nspawn $chroot/$repo_name pacman -Rscn --noconfirm "$@"
+		arch-nspawn $chroot/$repo_name pacman -Rscn --noconfirm "$@" || true
 		build "$repo_name" "$@"
 		)
 }
 
+build_changed() {
+    (
+    # git diff-tree --no-commit-id --name-status -r "$commit" | grep -v ^D | grep PKGBUILD$ | sed -e 's@/PKGBUILD$@@' -e 's@.*/@@' | xargs -n1 arch-nspawn chroot/aur pacman -Rscn --noconfirm
+    # git diff-tree --no-commit-id --name-status -r "$commit" | grep -v ^D | grep PKGBUILD$ | sed -e 's@/PKGBUILD$@@' -e 's@.*/@@' | xargs -n1 ./arch-ppa build aur
+	set -e
+	if [ "$#" -lt 1 ]; then
+	    echo "Must specify repository name to build (and optional package list to include)"
+	    return 1
+	fi
+	setup
+	repo_name=$1
+		mkdir -p $basedir/$repo_name
+		shift
+		commit="$1"
+		[ "$commit" == "" ] && commit=HEAD
+    changed_pkgbuilds="$(git diff-tree --no-commit-id --name-status -r "$commit" | grep -v ^D | grep PKGBUILD$ | sed -e 's@/PKGBUILD$@@' -e 's@.*/@@' | tr '\n' ' ')"
+    # remove them    
+    arch-nspawn $chroot/$repo_name pacman -Rscn --noconfirm $changed_pkgbuilds || true
+		build "$repo_name" $changed_pkgbuilds
+    )
+}
+
 if [ "$#" -gt 0 ]; then
     $*
 else
diff --git a/src/libretro-atari800-git/PKGBUILD b/src/libretro-atari800-git/PKGBUILD
index 5c9b1c1..6fe109e 100644
--- a/src/libretro-atari800-git/PKGBUILD
+++ b/src/libretro-atari800-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-atari800-git
-pkgver=27.ee20fb8
+pkgver=31.bd1db4e
 pkgrel=1
 pkgdesc="libretro implementation of Atari800 v3.1.0 (Atari 5200/400/800/XL/XE) (WIP)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/libretro-stella-git/PKGBUILD b/src/libretro-stella-git/PKGBUILD
index fb0fee7..e2ff251 100644
--- a/src/libretro-stella-git/PKGBUILD
+++ b/src/libretro-stella-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Oliver Jaksch <arch-aur@com-in.de>
 
 pkgname=libretro-stella-git
-pkgver=174.2c7eca0
+pkgver=176.cdbc9cc
 pkgrel=1
 pkgdesc="libretro implementation of Stella. (Atari 2600)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h')
diff --git a/src/prosody-hg-stable/PKGBUILD b/src/prosody-hg-stable/PKGBUILD
index 1bade6a..a5134d8 100644
--- a/src/prosody-hg-stable/PKGBUILD
+++ b/src/prosody-hg-stable/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=prosody-hg-stable
 pkgrel=1
-pkgver=0.10.r7111+.0dea440bdd46+
+pkgver=0.10.r7239+.703f7f45feb4+
 pkgver() {
   cd "$srcdir/prosody-hg"
   printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
diff --git a/src/python2-axolotl-git/PKGBUILD b/src/python2-axolotl-git/PKGBUILD
index 2b06e99..e1be15e 100644
--- a/src/python2-axolotl-git/PKGBUILD
+++ b/src/python2-axolotl-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='python2-axolotl-git'
 _pkgname='python-axolotl'
-pkgver=r39.9585d72
+pkgver=0.1.35.r0.g72f7c44
 pkgrel=1
 pkgdesc="Python port of libaxolotl"
 url="https://github.com/tgalal/python-axolotl"