diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index de24338..b5dbf46 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1076,6 +1076,7 @@ create_srcpackage() {
 	cd "$srcdir"
 	if (( ! SKIPINTEG || SOURCEONLY == 2 )); then
 		download_sources
+		devel_sources
 	fi
 	if (( ! SKIPINTEG )); then
 		# We can only check checksums if we have all files.
@@ -1288,6 +1289,80 @@ check_sanity() {
 	return 0
 }
 
+devel_sources() {
+	if [[ -n ${_darcstrunk} && -n ${_darcsmod} ]] ; then
+		if [ ! -d $startdir/$pkgname-$pkgver ]; then
+			mkdir $startdir/$pkgname-$pkgver
+		fi
+		pushd $startdir/$pkgname-$pkgver
+		darcs get --partial --set-scripts-executable $_darcstrunk/$_darcsmod
+		bsdtar -cjf $startdir/$pkgname-$pkgver.tar.bz2 $_darcsmod
+		popd
+	elif [[ -n ${_cvsroot} && -n ${_cvsmod} ]] ; then
+		if [ ! -d $startdir/$pkgname-$pkgver ]; then
+			mkdir $startdir/$pkgname-$pkgver
+		fi
+		pushd $startdir/$pkgname-$pkgver
+		if [ -d $_cvsmod/CVS ]; then
+			cd $_cvsmod
+			cvs -z3 update -d
+			pushd $startdir/$pkgname-$pkgver
+		else
+			cvs -z3 -d $_cvsroot co -D $pkgver -f $_cvsmod
+		fi
+		bsdtar -cjf $startdir/$pkgname-$pkgver.tar.bz2 $_cvsmod
+		popd
+	elif [[ -n ${_gitroot} && -n ${_gitname} ]] ; then
+		if [ ! -d $startdir/$pkgname-$pkgver ]; then
+			mkdir $startdir/$pkgname-$pkgver
+		fi
+		pushd $startdir/$pkgname-$pkgver
+		if [ -d $_gitname/.git ]; then
+			cd $_gitname && git pull origin
+			pushd $startdir/$pkgname-$pkgver
+		else
+			git clone $_gitroot $_gitname
+		fi
+		bsdtar -cjf $startdir/$pkgname-$pkgver.tar.bz2 $_gitname
+		popd
+	elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then
+		if [ ! -d $startdir/$pkgname-$pkgver ]; then
+			mkdir $startdir/$pkgname-$pkgver
+		fi
+		pushd $startdir/$pkgname-$pkgver
+		if [ -d $_svnmod/.svn ]; then
+			cd $_svnmod && svn up -r $pkgver
+			pushd $startdir/$pkgname-$pkgver
+		else
+			svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
+		fi
+		bsdtar -cjf $startdir/$pkgname-$pkgver.tar.bz2 $_svnmod
+		popd
+	elif [[ -n ${_bzrtrunk} && -n ${_bzrmod} ]] ; then
+		if [ ! -d $startdir/$pkgname-$pkgver ]; then
+			mkdir $startdir/$pkgname-$pkgver
+		fi
+		pushd $startdir/$pkgname-$pkgver
+		bzr co $_bzrtrunk $_bzrmod
+		bsdtar -cjf $startdir/$pkgname-$pkgver.tar.bz2 $_bzrmod
+		popd
+	elif [[ -n ${_hgroot} && -n ${_hgrepo} ]] ; then
+		if [ ! -d $startdir/$pkgname-$pkgver ]; then
+			mkdir $startdir/$pkgname-$pkgver
+		fi
+		pushd $startdir/$pkgname-$pkgver
+		if [ -d $_hgrepo ]; then
+			cd $_hgrepo
+			hg pull -u
+			pushd $startdir/$pkgname-$pkgver
+		else
+			hg clone $_hgroot $_hgrepo
+		fi
+		bsdtar -cjf $startdir/$pkgname-$pkgver.tar.bz2 $_hgrepo
+		popd
+	fi
+}
+
 devel_check() {
 	newpkgver=""