41 files changed, 665 insertions, 514 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..fb151daf
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.py  diff=python
diff --git a/configure.ac b/configure.ac
index c3b3722c..5f1a1534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,11 @@ AC_ARG_WITH(db-ext,
 	AS_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
 	[DBEXT=$withval], [DBEXT=.db.tar.gz])
 
+# Help line for buildscript filename
+AC_ARG_WITH(buildscript,
+	AS_HELP_STRING([--with-buildscript=name], [set the build script name used by makepkg]),
+	[BUILDSCRIPT=$withval], [BUILDSCRIPT=PKGBUILD])
+
 # Help line for libdownload/libfetch
 AC_ARG_ENABLE(internal-download,
 	AS_HELP_STRING([--disable-internal-download], [do not build with libdownload/libfetch support]),
@@ -314,6 +319,9 @@ AC_DEFINE_UNQUOTED([SRCEXT], "$SRCEXT", [The file extension used by pacman sourc
 # Set database file extension
 AC_SUBST(DBEXT)
 AC_DEFINE_UNQUOTED([DBEXT], "$DBEXT", [The file extension used by pacman databases])
+# Set makepkg build script name
+AC_SUBST(BUILDSCRIPT)
+AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg])
 
 # Configuration files
 AC_CONFIG_FILES([
@@ -326,6 +334,7 @@ doc/Makefile
 etc/Makefile
 po/Makefile.in
 pactest/Makefile
+pactest/tests/Makefile
 contrib/Makefile
 Makefile
 ])
@@ -361,6 +370,7 @@ ${PACKAGE_NAME}:
     package extension      : ${PKGEXT}
     source pkg extension   : ${SRCEXT}
     database extension     : ${DBEXT}
+    build script name      : ${BUILDSCRIPT}
 
   Compilation options:
     Run make in doc/ dir   : ${wantdoc}
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 416f55e1..96c7a505 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -187,8 +187,8 @@ name. The syntax is: `$$source=('filename::url')$$`
 		disable this option.
 
 	*docs*;;
-		Save doc and info directories. If you wish to delete doc and
-		info directories, specify `!docs` in the array.
+		Save doc directories. If you wish to delete doc directories,
+		specify `!docs` in the array.
 
 	*libtool*;;
 		Leave libtool (.la) files in packages. Specify `!libtool` to
@@ -198,7 +198,7 @@ name. The syntax is: `$$source=('filename::url')$$`
 		Leave empty directories in packages.
 
 	*zipman*;;
-		Compress man pages with gzip.
+		Compress man and info pages with gzip.
 
 	*ccache*;;
 		Allow the use of ccache during build. More useful in its negative
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 74285aaf..4bb37808 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -52,6 +52,9 @@ Options
 	Removes all cached source files from the directory specified in `SRCDEST`
 	in linkman:makepkg.conf[5].
 
+*--config* <`/path/to/config`>::
+	Use an alternate config file instead of the `/etc/makepkg.conf` default;
+
 *-d, \--nodeps*::
 	Do not perform any dependency checks. This will let you override and
 	ignore any dependencies required. There is a good chance this option
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index b5398af7..044c69ea 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -61,6 +61,11 @@ Options
 **CXXFLAGS=**"cxxflags"::
 	Flags used for the C++ compiler; see CFLAGS for more info.
 
+**LDFLAGS=**"ldflags"::
+	Flags used for the linker. Several options may be specified with common
+	usage resembling ``-Wl,--hash-style=gnu``. Read ld(1) for more details on
+	available linker flags.
+
 **MAKEFLAGS=**"makeflags"::
 	This is often used to set the number of jobs used, for example, `-j2`.
 	Other flags that make accepts can also be passed.
@@ -98,7 +103,7 @@ Options
 	running in the DistCC cluster. In addition, you will want to modify your
 	`MAKEFLAGS`.
 
-**OPTIONS=(**strip docs libtool emptydirs zipman**)**::
+**OPTIONS=(**strip !docs libtool emptydirs zipman**)**::
 	This array contains options that affect the default packaging. They are
 	equivalent to options that can be placed in the PKGBUILD; the defaults are
 	shown here. All options should always be left in the array; to enable or
@@ -111,8 +116,9 @@ Options
 		option.
 
 	*docs*;;
-		Save doc and info directories. If you wish to delete doc and info
-		directories, specify `!docs' in the array.
+		Save doc directories. If you wish to delete doc directories, specify
+		`!docs' in the array. The directories affected are specified by the
+		`DOC_DIRS` variable.
 
 	*libtool*;;
 		Leave libtool (.la) files in packages. Specify `!libtool' to remove
@@ -122,14 +128,25 @@ Options
 		Leave empty directories in packages.
 
 	*zipman*;;
-		Compress man pages with gzip.
+		Compress manual (man and info) pages with gzip.
+
+	*purge*;;
+		Remove files specified by the `PUGRE_TARGETS` variable from the
+		package.
 
 **INTEGRITY_CHECK=(**check1 ...**)**::
 	File integrity checks to use. Multiple checks may be specified; this
 	affects both generation and checking. The current valid options are:
 	`md5`, `sha1`, `sha256`, `sha384`, and `sha512`.
 
-**DOC_DIRS=(**usr/{,share/}{info,doc} ...**)**::
+**MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**::
+	If "zipman" is specified in the OPTIONS array, this variable will
+	instruct makepkg where to look to compress manual (man and info)
+	pages. If you build packages that are located in opt/, you may need
+	to add the directory to this array. *NOTE:* Do not add the leading
+	slash to the directory name.
+
+**DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**::
 	If "!docs" is specified in the OPTIONS array, this variable will
 	instruct makepkg where to look to remove docs. If you build packages
 	that are located in opt/, you may need to add the directory to this
@@ -142,6 +159,11 @@ Options
 	to this array. *NOTE:* Do not add the leading slash to the directory
 	name.
 
+**PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**::
+	If "purge" is specified in the OPTIONS array, this variable will
+	instruct makepkg which files to remove from the package. This is
+	useful for index files that are added by multiple packages.
+
 **PKGDEST=**"/path/to/folder"::
 	If this value is not set, packages will by default be placed in the
 	current directory (location of the linkman:PKGBUILD[5]). Many people
@@ -157,7 +179,7 @@ Options
 	This value is used when querying a package to see who was the builder.
 	It is recommended you change this to your name and email address.
 
-*BUILDSCRIPT*, *PKGEXT*, *SRCEXT*, *DB_COMPRESSION*, *DB_CHECKSUMS*::
+*BUILDSCRIPT*, *PKGEXT*, *SRCEXT*::
 	Do not touch these unless you know what you are doing.
 
 
diff --git a/etc/Makefile.am b/etc/Makefile.am
index b4f4972e..55c28c3b 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -20,9 +20,10 @@ edit = sed \
 	-e 's|@ROOTDIR[@]|$(ROOTDIR)|g'
 
 $(dist_sysconf_DATA): Makefile
-	rm -f $@ $@.tmp
-	$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
-	mv $@.tmp $@
+	@echo '    ' GEN $@;
+	@rm -f $@ $@.tmp
+	@$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp
+	@mv $@.tmp $@
 
 makepkg.conf: $(srcdir)/makepkg.conf.in
 pacman.conf: $(srcdir)/pacman.conf.in
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 0241a8ec..675e5f9b 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -31,6 +31,7 @@ CHOST="@CHOST@"
 # -mtune optimizes for an architecture, but builds for whole processor family
 CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
 CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
+#LDFLAGS=""
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
@@ -58,23 +59,28 @@ BUILDENV=(fakeroot !distcc color !ccache !xdelta)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool emptydirs zipman)
+# Default: OPTIONS=(strip !docs libtool emptydirs zipman purge)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:     Strip symbols from binaries/libraries
 #-- docs:      Save doc and info directories
 #-- libtool:   Leave libtool (.la) files in packages
 #-- emptydirs: Leave empty directories in packages
-#-- zipman:    Compress manpages with gzip
+#-- zipman:    Compress manual (man and info) pages with gzip
+#-- purge:     Remove files sepecified below from package
 #
-OPTIONS=(strip docs libtool emptydirs zipman)
+OPTIONS=(strip !docs libtool emptydirs zipman purge)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
-#-- Info and doc directories to remove (if option set correctly above)
-DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/*/{info,doc,gtk-doc})
+#-- Manual (man and info) directories to compress (if option set correctly above)
+MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+#-- Doc directories to remove (if option set correctly above)
+DOC_DIRS=(usr/{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 #-- Directories to be searched for the strip option (if option set correctly above)
 STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,sbin})
+#-- Files to be removed from all packages
+PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 
 #########################################################################
 # PACKAGE OUTPUT
@@ -90,16 +96,13 @@ STRIP_DIRS=(bin lib sbin usr/{bin,lib,sbin,local/{bin,lib,sbin}} opt/*/{bin,lib,
 #PACKAGER="John Doe <john@doe.com>"
 
 #########################################################################
-# BUILDSCRIPT/EXTENSION DEFAULTS
+# EXTENSION DEFAULTS
 #########################################################################
 #
 # WARNING: Do NOT modify these variables unless you know what you are
 #          doing.
 #
-BUILDSCRIPT='PKGBUILD'
 PKGEXT='@PKGEXT@'
 SRCEXT='@SRCEXT@'
-DB_COMPRESSION='gz'
-DB_CHECKSUMS=(md5)
 
 # vim: set ft=sh ts=2 sw=2 et:
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 1e8ec9f2..b0a7671b 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -114,7 +114,7 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 
 		/* look for unsatisfied dependencies */
 		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
-		lp = alpm_checkdeps(db, 1, NULL, trans->packages);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, NULL, trans->packages);
 		if(lp != NULL) {
 			if(data) {
 				*data = lp;
@@ -650,17 +650,18 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 	if(local) {
 		is_upgrade = 1;
 
-		EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, NULL);
-		_alpm_log(PM_LOG_DEBUG, "upgrading package %s-%s\n",
-				newpkg->name, newpkg->version);
-
 		/* we'll need to save some record for backup checks later */
 		oldpkg = _alpm_pkg_dup(local);
 		/* make sure all infos are loaded because the database entry
 		 * will be removed soon */
 		_alpm_db_read(oldpkg->origin_data.db, oldpkg, INFRQ_ALL);
+
+		EVENT(trans, PM_TRANS_EVT_UPGRADE_START, newpkg, oldpkg);
+		_alpm_log(PM_LOG_DEBUG, "upgrading package %s-%s\n",
+				newpkg->name, newpkg->version);
+
 		/* copy over the install reason */
-		newpkg->reason = alpm_pkg_get_reason(local);
+		newpkg->reason = alpm_pkg_get_reason(oldpkg);
 
 		/* pre_upgrade scriptlet */
 		if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) {
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 16b48a0a..eda35d30 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -170,10 +170,10 @@ int alpm_db_setserver(pmdb_t *db, const char *url);
 int alpm_db_update(int level, pmdb_t *db);
 
 pmpkg_t *alpm_db_get_pkg(pmdb_t *db, const char *name);
-alpm_list_t *alpm_db_getpkgcache(pmdb_t *db);
+alpm_list_t *alpm_db_get_pkgcache(pmdb_t *db);
 
 pmgrp_t *alpm_db_readgrp(pmdb_t *db, const char *name);
-alpm_list_t *alpm_db_getgrpcache(pmdb_t *db);
+alpm_list_t *alpm_db_get_grpcache(pmdb_t *db);
 alpm_list_t *alpm_db_search(pmdb_t *db, const alpm_list_t* needles);
 
 /*
@@ -218,6 +218,7 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg);
 alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg);
+pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg);
 void *alpm_pkg_changelog_open(pmpkg_t *pkg);
 size_t alpm_pkg_changelog_read(void *ptr, size_t size,
 		const pmpkg_t *pkg, const void *fp);
@@ -253,8 +254,6 @@ alpm_list_t *alpm_grp_get_pkgs(const pmgrp_t *grp);
 pmpkg_t *alpm_sync_get_pkg(const pmsyncpkg_t *sync);
 alpm_list_t *alpm_sync_get_removes(const pmsyncpkg_t *sync);
 pmpkg_t *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync);
-int alpm_sync_sysupgrade(pmdb_t *db_local,
-		alpm_list_t *dbs_sync, alpm_list_t **syncpkgs);
 
 /*
  * Transactions
@@ -282,7 +281,7 @@ typedef enum _pmtransflag_t {
 	PM_TRANS_FLAG_DOWNLOADONLY = 0x200,
 	PM_TRANS_FLAG_NOSCRIPTLET = 0x400,
 	PM_TRANS_FLAG_NOCONFLICTS = 0x800,
-	PM_TRANS_FLAG_PRINTURIS = 0x1000,
+	/* 0x1000 flag can go here */
 	PM_TRANS_FLAG_NEEDED = 0x2000,
 	PM_TRANS_FLAG_ALLEXPLICIT = 0x4000,
 	PM_TRANS_FLAG_UNNEEDED = 0x8000,
@@ -364,10 +363,6 @@ typedef enum _pmtransevt_t {
 	 * A line of text is passed to the callback.
 	 */
 	PM_TRANS_EVT_SCRIPTLET_INFO,
-	/** Print URI.
-	 * The database's URI and the package's filename are passed to the callback.
-	 */
-	PM_TRANS_EVT_PRINTURI,
 	/** Files will be downloaded from a repository.
 	 * The repository's tree name is passed to the callback.
 	 */
@@ -431,7 +426,7 @@ typedef enum _pmdepmod_t {
 } pmdepmod_t;
 
 int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep);
-alpm_list_t *alpm_checkdeps(pmdb_t *db, int reversedeps,
+alpm_list_t *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 		alpm_list_t *remove, alpm_list_t *upgrade);
 alpm_list_t *alpm_deptest(pmdb_t *db, alpm_list_t *targets);
 
@@ -439,7 +434,7 @@ const char *alpm_miss_get_target(const pmdepmissing_t *miss);
 pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss);
 const char *alpm_miss_get_causingpkg(const pmdepmissing_t *miss);
 
-alpm_list_t *alpm_checkdbconflicts(pmdb_t *db_local);
+alpm_list_t *alpm_checkconflicts(alpm_list_t *pkglist);
 
 const char *alpm_conflict_get_package1(pmconflict_t *conflict);
 const char *alpm_conflict_get_package2(pmconflict_t *conflict);
@@ -531,7 +526,7 @@ enum _pmerrno_t {
 	PM_ERR_INVALID_REGEX,
 	/* External library errors */
 	PM_ERR_LIBARCHIVE,
-	PM_ERR_LIBDOWNLOAD,
+	PM_ERR_LIBFETCH,
 	PM_ERR_EXTERNAL_DOWNLOAD
 };
 
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
index a044fc60..499e55a4 100644
--- a/lib/libalpm/conflict.c
+++ b/lib/libalpm/conflict.c
@@ -218,11 +218,11 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages)
 
 /** Check the package conflicts in a database
  *
- * @param db_local the database to check
+ * @param pkglist the list of packages to check
  * @return an alpm_list_t of pmconflict_t
  */
-alpm_list_t SYMEXPORT *alpm_checkdbconflicts(pmdb_t *db_local) {
-	return(_alpm_innerconflicts(_alpm_db_get_pkgcache(db_local)));
+alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_list_t *pkglist) {
+	return(_alpm_innerconflicts(pkglist));
 }
 
 /* Returns a alpm_list_t* of file conflicts.
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 5632ffac..9b91ce47 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -263,7 +263,7 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name)
  * @param db pointer to the package database to get the package from
  * @return the list of packages on success, NULL on error
  */
-alpm_list_t SYMEXPORT *alpm_db_getpkgcache(pmdb_t *db)
+alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
 
@@ -295,7 +295,7 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name)
  * @param db pointer to the package database to get the group from
  * @return the list of groups on success, NULL on error
  */
-alpm_list_t SYMEXPORT *alpm_db_getgrpcache(pmdb_t *db)
+alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db)
 {
 	ALPM_LOG_FUNC;
 
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index c667daa2..96c971a2 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -229,13 +229,13 @@ alpm_list_t SYMEXPORT *alpm_deptest(pmdb_t *db, alpm_list_t *targets)
 
 /** Checks dependencies and returns missing ones in a list.
  * Dependencies can include versions with depmod operators.
- * @param db pointer to the local package database
+ * @param pkglist the list of local packages
  * @param reversedeps handles the backward dependencies
  * @param remove an alpm_list_t* of packages to be removed
  * @param upgrade an alpm_list_t* of packages to be upgraded (remove-then-upgrade)
  * @return an alpm_list_t* of pmpkg_t* of missing_t pointers.
  */
-alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
+alpm_list_t SYMEXPORT *alpm_checkdeps(alpm_list_t *pkglist, int reversedeps,
 		alpm_list_t *remove, alpm_list_t *upgrade)
 {
 	alpm_list_t *i, *j;
@@ -245,12 +245,8 @@ alpm_list_t SYMEXPORT *alpm_checkdeps(pmdb_t *db, int reversedeps,
 
 	ALPM_LOG_FUNC;
 
-	if(db == NULL) {
-		return(NULL);
-	}
-
 	targets = alpm_list_join(alpm_list_copy(remove), alpm_list_copy(upgrade));
-	for(i = _alpm_db_get_pkgcache(db); i; i = i->next) {
+	for(i = pkglist; i; i = i->next) {
 		void *pkg = i->data;
 		if(alpm_list_find(targets, pkg, _alpm_pkg_cmp)) {
 			modified = alpm_list_add(modified, pkg);
@@ -572,7 +568,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, alpm_list_t *list,
 	for(i = list; i; i = i->next) {
 		pmpkg_t *tpkg = i->data;
 		targ = alpm_list_add(NULL, tpkg);
-		deps = alpm_checkdeps(local, 0, remove, targ);
+		deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ);
 		alpm_list_free(targ);
 		for(j = deps; j; j = j->next) {
 			pmdepmissing_t *miss = j->data;
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c
index ca13652e..06f643f7 100644
--- a/lib/libalpm/dload.c
+++ b/lib/libalpm/dload.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
+#include <signal.h>
 #include <limits.h>
 /* the following two are needed on BSD for libfetch */
 #if defined(HAVE_SYS_SYSLIMITS_H)
@@ -35,14 +36,14 @@
 
 #if defined(HAVE_LIBDOWNLOAD)
 #include <download.h>
+#define fetchFreeURL downloadFreeURL
+#define fetchLastErrCode downloadLastErrCode
+#define fetchLastErrString downloadLastErrString
+#define fetchParseURL downloadParseURL
+#define fetchTimeout downloadTimeout
+#define fetchXGet downloadXGet
 #elif defined(HAVE_LIBFETCH)
 #include <fetch.h>
-#define downloadFreeURL fetchFreeURL
-#define downloadLastErrCode fetchLastErrCode
-#define downloadLastErrString fetchLastErrString
-#define downloadParseURL fetchParseURL
-#define downloadTimeout fetchTimeout
-#define downloadXGet fetchXGet
 #endif
 
 /* libalpm */
@@ -86,7 +87,7 @@ static char *get_tempfile(const char *path, const char *filename) {
 static struct url *url_for_string(const char *url)
 {
 	struct url *ret = NULL;
-	ret = downloadParseURL(url);
+	ret = fetchParseURL(url);
 	if(!ret) {
 		_alpm_log(PM_LOG_ERROR, _("url '%s' is invalid\n"), url);
 		RET_ERR(PM_ERR_SERVER_BAD_URL, NULL);
@@ -114,6 +115,7 @@ static int download_internal(const char *url, const char *localpath,
 	int chk_resume = 0, ret = 0;
 	size_t dl_thisfile = 0, nread = 0;
 	char *tempfile, *destfile, *filename;
+	struct sigaction new_action, old_action;
 	struct url *fileurl = url_for_string(url);
 	char buffer[PM_DLBUF_LEN];
 
@@ -148,23 +150,29 @@ static int download_internal(const char *url, const char *localpath,
 	_alpm_log(PM_LOG_DEBUG, "FTP_PROXY:  %s\n", getenv("FTP_PROXY"));
 	_alpm_log(PM_LOG_DEBUG, "ftp_proxy:  %s\n", getenv("ftp_proxy"));
 
-	/* libdownload does not reset the error code, reset it in
-	 * the case of previous errors */
-	downloadLastErrCode = 0;
+	/* libfetch does not reset the error code */
+	fetchLastErrCode = 0;
 
 	/* 10s timeout - TODO make a config option */
-	downloadTimeout = 10000;
+	fetchTimeout = 10000;
 
-	dlf = downloadXGet(fileurl, &ust, (handle->nopassiveftp ? "" : "p"));
+	/* ignore any SIGPIPE signals- these may occur if our FTP socket dies or
+	 * something along those lines. Store the old signal handler first. */
+	new_action.sa_handler = SIG_IGN;
+	sigemptyset(&new_action.sa_mask);
+	sigaction(SIGPIPE, NULL, &old_action);
+	sigaction(SIGPIPE, &new_action, NULL);
 
-	if(downloadLastErrCode != 0 || dlf == NULL) {
+	dlf = fetchXGet(fileurl, &ust, (handle->nopassiveftp ? "" : "p"));
+
+	if(fetchLastErrCode != 0 || dlf == NULL) {
 		const char *host = _("disk");
 		if(strcmp(SCHEME_FILE, fileurl->scheme) != 0) {
 			host = fileurl->host;
 		}
-		pm_errno = PM_ERR_LIBDOWNLOAD;
+		pm_errno = PM_ERR_LIBFETCH;
 		_alpm_log(PM_LOG_ERROR, _("failed retrieving file '%s' from %s : %s\n"),
-				filename, host, downloadLastErrString);
+				filename, host, fetchLastErrString);
 		ret = -1;
 		goto cleanup;
 	} else {
@@ -209,9 +217,9 @@ static int download_internal(const char *url, const char *localpath,
 	while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) {
 		size_t nwritten = 0;
 		if(ferror(dlf)) {
-			pm_errno = PM_ERR_LIBDOWNLOAD;
+			pm_errno = PM_ERR_LIBFETCH;
 			_alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s\n"),
-					filename, downloadLastErrString);
+					filename, fetchLastErrString);
 			ret = -1;
 			goto cleanup;
 		}
@@ -243,6 +251,9 @@ static int download_internal(const char *url, const char *localpath,
 	ret = 0;
 
 cleanup:
+	/* restore any existing SIGPIPE signal handler */
+	sigaction(SIGPIPE, &old_action, NULL);
+
 	FREE(tempfile);
 	FREE(destfile);
 	if(localf != NULL) {
@@ -251,7 +262,7 @@ cleanup:
 	if(dlf != NULL) {
 		fclose(dlf);
 	}
-	downloadFreeURL(fileurl);
+	fetchFreeURL(fileurl);
 	return(ret);
 }
 #endif
diff --git a/lib/libalpm/error.c b/lib/libalpm/error.c
index 05caf8ec..80a4fb1a 100644
--- a/lib/libalpm/error.c
+++ b/lib/libalpm/error.c
@@ -32,9 +32,9 @@
 
 #if defined(HAVE_LIBDOWNLOAD)
 #include <download.h> /* downloadLastErrString */
+#define fetchLastErrString downloadLastErrString
 #elif defined(HAVE_LIBFETCH)
 #include <fetch.h> /* fetchLastErrString */
-#define downloadLastErrString fetchLastErrString
 #endif
 
 /* libalpm */
@@ -154,9 +154,9 @@ const char SYMEXPORT *alpm_strerror(int err)
 			 * requires the archive struct, so we can't. Just use a generic
 			 * error string instead. */
 			return _("libarchive error");
-		case PM_ERR_LIBDOWNLOAD:
+		case PM_ERR_LIBFETCH:
 #if defined(INTERNAL_DOWNLOAD)
-			return downloadLastErrString;
+			return fetchLastErrString;
 #else
 			/* obviously shouldn't get here... */
 			return _("download library error");
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index af1cc78b..7dc01223 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -48,16 +48,7 @@ pmhandle_t *_alpm_handle_new()
 	ALPM_LOG_FUNC;
 
 	CALLOC(handle, 1, sizeof(pmhandle_t), RET_ERR(PM_ERR_MEMORY, NULL));
-
 	handle->lckfd = -1;
-	handle->logstream = NULL;
-
-	handle->root = NULL;
-	handle->dbpath = NULL;
-	handle->cachedirs = NULL;
-	handle->lockfile = NULL;
-	handle->logfile = NULL;
-	handle->usedelta = 0;
 
 	return(handle);
 }
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index a9f4b43d..ee0ff6f5 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -422,6 +422,15 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg)
 	return pkg->backup;
 }
 
+pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg)
+{
+	/* Sanity checks */
+	ASSERT(pkg != NULL, return(NULL));
+	ASSERT(pkg->origin == PKG_FROM_CACHE, return(NULL));
+
+	return(pkg->origin_data.db);
+}
+
 /**
  * Open a package changelog for reading. Similar to fopen in functionality,
  * except that the returned 'file stream' could really be from an archive
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 0bec5229..76bb5525 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -104,7 +104,7 @@ static void remove_prepare_cascade(pmtrans_t *trans, pmdb_t *db,
 		}
 		alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
 		alpm_list_free(lp);
-		lp = alpm_checkdeps(db, 1, trans->packages, NULL);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL);
 	}
 }
 
@@ -134,7 +134,7 @@ static void remove_prepare_keep_needed(pmtrans_t *trans, pmdb_t *db,
 		}
 		alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_depmiss_free);
 		alpm_list_free(lp);
-		lp = alpm_checkdeps(db, 1, trans->packages, NULL);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL);
 	}
 }
 
@@ -161,7 +161,7 @@ int _alpm_remove_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
 		EVENT(trans, PM_TRANS_EVT_CHECKDEPS_START, NULL, NULL);
 
 		_alpm_log(PM_LOG_DEBUG, "looking for unsatisfied dependencies\n");
-		lp = alpm_checkdeps(db, 1, trans->packages, NULL);
+		lp = alpm_checkdeps(_alpm_db_get_pkgcache(db), 1, trans->packages, NULL);
 		if(lp != NULL) {
 
 			if(trans->flags & PM_TRANS_FLAG_CASCADE) {
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 4a705b57..b458874d 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -77,17 +77,12 @@ void _alpm_sync_free(pmsyncpkg_t *sync)
 
 /* Find recommended replacements for packages during a sync.
  */
-static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
-		alpm_list_t *dbs_sync, alpm_list_t **syncpkgs)
+static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync)
 {
 	alpm_list_t *i, *j, *k; /* wow */
 
 	ALPM_LOG_FUNC;
 
-	if(syncpkgs == NULL) {
-		return(-1);
-	}
-
 	/* check for "recommended" package replacements */
 	_alpm_log(PM_LOG_DEBUG, "checking for package replacements\n");
 	for(i = dbs_sync; i; i = i->next) {
@@ -113,13 +108,10 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 										alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
 										alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
 				} else {
-					/* get confirmation for the replacement */
-					if(trans) {
-						int doreplace = 0;
-						QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace);
-						if(!doreplace) {
-							continue;
-						}
+					int doreplace = 0;
+					QUESTION(trans, PM_TRANS_CONV_REPLACE_PKG, lpkg, spkg, db->treename, &doreplace);
+					if(!doreplace) {
+						continue;
 					}
 
 					/* if confirmed, add this to the 'final' list, designating 'lpkg' as
@@ -129,7 +121,7 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 
 					/* check if spkg->name is already in the packages list. */
 					/* TODO: same package name doesn't mean same package */
-					sync = _alpm_sync_find(*syncpkgs, alpm_pkg_get_name(spkg));
+					sync = _alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg));
 					if(sync) {
 						/* found it -- just append to the removes list */
 						sync->removes = alpm_list_add(sync->removes, lpkg);
@@ -143,15 +135,12 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
 						sync = _alpm_sync_new(alpm_pkg_get_reason(lpkg), spkg, NULL);
 						if(sync == NULL) {
 							pm_errno = PM_ERR_MEMORY;
-							alpm_list_free_inner(*syncpkgs, (alpm_list_fn_free)_alpm_sync_free);
-							alpm_list_free(*syncpkgs);
-							*syncpkgs = NULL;
 							return(-1);
 						}
 						sync->removes = alpm_list_add(NULL, lpkg);
 						_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 									alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
-						*syncpkgs = alpm_list_add(*syncpkgs, sync);
+						trans->packages = alpm_list_add(trans->packages, sync);
 					}
 					_alpm_log(PM_LOG_DEBUG, "%s-%s elected for removal (to be replaced by %s-%s)\n",
 							alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
@@ -199,33 +188,19 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync)
 	return(NULL);
 }
 
-/** Get a list of upgradable packages on the current system
- * Adds out of date packages to *list.
- * @arg list pointer to a list of pmsyncpkg_t.
- */
-int SYMEXPORT alpm_sync_sysupgrade(pmdb_t *db_local,
-		alpm_list_t *dbs_sync, alpm_list_t **syncpkgs)
-{
-	return(_alpm_sync_sysupgrade(NULL, db_local, dbs_sync, syncpkgs));
-}
-
-int _alpm_sync_sysupgrade(pmtrans_t *trans,
-		pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **syncpkgs)
+int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync)
 {
 	alpm_list_t *i, *j, *replaced = NULL;
 
 	ALPM_LOG_FUNC;
 
-	if(syncpkgs == NULL) {
-		return(-1);
-	}
 	/* check for "recommended" package replacements */
-	if(find_replacements(trans, db_local, dbs_sync, syncpkgs)) {
+	if(find_replacements(trans, db_local, dbs_sync)) {
 		return(-1);
 	}
 
 	/* compute the to-be-replaced packages for efficiency */
-	for(i = *syncpkgs; i; i = i->next) {
+	for(i = trans->packages; i; i = i->next) {
 		pmsyncpkg_t *sync = i->data;
 		for(j = sync->removes; j; j = j->next) {
 			replaced = alpm_list_add(replaced, j->data);
@@ -255,22 +230,19 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans,
 			}
 
 			/* add the upgrade package to our pmsyncpkg_t list */
-			if(_alpm_sync_find(*syncpkgs, alpm_pkg_get_name(spkg))) {
+			if(_alpm_sync_find(trans->packages, alpm_pkg_get_name(spkg))) {
 				/* avoid duplicated targets */
 				continue;
 			}
 			/* we can set any reason here, it will be overridden by add_commit */
 			pmsyncpkg_t *sync = _alpm_sync_new(PM_PKG_REASON_EXPLICIT, spkg, NULL);
 			if(sync == NULL) {
-				alpm_list_free_inner(*syncpkgs, (alpm_list_fn_free)_alpm_sync_free);
-				alpm_list_free(*syncpkgs);
-				*syncpkgs = NULL;
 				alpm_list_free(replaced);
 				return(-1);
 			}
 			_alpm_log(PM_LOG_DEBUG, "adding package %s-%s to the transaction targets\n",
 							alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
-			*syncpkgs = alpm_list_add(*syncpkgs, sync);
+			trans->packages = alpm_list_add(trans->packages, sync);
 		}
 	}
 
@@ -497,8 +469,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		EVENT(trans, PM_TRANS_EVT_RESOLVEDEPS_DONE, NULL, NULL);
 	}
 
-	/* We don't care about conflicts if we're just printing uris */
-	if(!(trans->flags & (PM_TRANS_FLAG_NOCONFLICTS | PM_TRANS_FLAG_PRINTURIS))) {
+	if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) {
 		/* check for inter-conflicts and whatnot */
 		EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL);
 
@@ -631,7 +602,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync
 		}
 
 		_alpm_log(PM_LOG_DEBUG, "checking dependencies\n");
-		deps = alpm_checkdeps(db_local, 1, remove, list);
+		deps = alpm_checkdeps(_alpm_db_get_pkgcache(db_local), 1, remove, list);
 		if(deps) {
 			pm_errno = PM_ERR_UNSATISFIED_DEPS;
 			ret = -1;
@@ -838,32 +809,27 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 
 				fname = alpm_pkg_get_filename(spkg);
 				ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1));
-				if(trans->flags & PM_TRANS_FLAG_PRINTURIS) {
-					EVENT(trans, PM_TRANS_EVT_PRINTURI, (char *)alpm_db_get_url(current),
-							(char *)fname);
-				} else {
-					if(spkg->download_size != 0) {
-						alpm_list_t *delta_path = spkg->delta_path;
-						if(delta_path) {
-							alpm_list_t *dlts = NULL;
-
-							for(dlts = delta_path; dlts; dlts = dlts->next) {
-								pmdelta_t *d = dlts->data;
-
-								if(d->download_size != 0) {
-									/* add the delta filename to the download list if
-									 * it's not in the cache */
-									files = alpm_list_add(files, strdup(d->delta));
-								}
-
-								/* keep a list of the delta files for md5sums */
-								deltas = alpm_list_add(deltas, d);
+				if(spkg->download_size != 0) {
+					alpm_list_t *delta_path = spkg->delta_path;
+					if(delta_path) {
+						alpm_list_t *dlts = NULL;
+
+						for(dlts = delta_path; dlts; dlts = dlts->next) {
+							pmdelta_t *d = dlts->data;
+
+							if(d->download_size != 0) {
+								/* add the delta filename to the download list if
+								 * it's not in the cache */
+								files = alpm_list_add(files, strdup(d->delta));
 							}
 
-						} else {
-							/* not using deltas, so add the file to the download list */
-							files = alpm_list_add(files, strdup(fname));
+							/* keep a list of the delta files for md5sums */
+							deltas = alpm_list_add(deltas, d);
 						}
+
+					} else {
+						/* not using deltas, so add the file to the download list */
+						files = alpm_list_add(files, strdup(fname));
 					}
 				}
 			}
@@ -880,9 +846,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data)
 			FREELIST(files);
 		}
 	}
-	if(trans->flags & PM_TRANS_FLAG_PRINTURIS) {
-		return(0);
-	}
 
 	/* clear out value to let callback know we are done */
 	if(handle->totaldlcb) {
diff --git a/lib/libalpm/sync.h b/lib/libalpm/sync.h
index b71f0ef2..b6a4bbff 100644
--- a/lib/libalpm/sync.h
+++ b/lib/libalpm/sync.h
@@ -33,8 +33,7 @@ struct __pmsyncpkg_t {
 pmsyncpkg_t *_alpm_sync_new(pmpkgreason_t newreason, pmpkg_t *spkg, alpm_list_t *removes);
 void _alpm_sync_free(pmsyncpkg_t *data);
 
-int _alpm_sync_sysupgrade(pmtrans_t *trans,
-		pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **syncpkgs);
+int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync);
 
 int _alpm_sync_addtarget(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, char *name);
 int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, alpm_list_t **data);
diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c
index acad84e8..4b831193 100644
--- a/lib/libalpm/trans.c
+++ b/lib/libalpm/trans.c
@@ -100,7 +100,7 @@ int SYMEXPORT alpm_trans_sysupgrade()
 	ASSERT(trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
 	ASSERT(trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1));
 
-	return(_alpm_trans_sysupgrade(trans));
+	return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync));
 }
 
 /** Add a target to the transaction.
@@ -226,15 +226,6 @@ pmtrans_t *_alpm_trans_new()
 	ALPM_LOG_FUNC;
 
 	CALLOC(trans, 1, sizeof(pmtrans_t), RET_ERR(PM_ERR_MEMORY, NULL));
-
-	trans->packages = NULL;
-	trans->skip_add = NULL;
-	trans->skip_remove = NULL;
-	trans->type = 0;
-	trans->flags = 0;
-	trans->cb_event = NULL;
-	trans->cb_conv = NULL;
-	trans->cb_progress = NULL;
 	trans->state = STATE_IDLE;
 
 	return(trans);
@@ -280,17 +271,6 @@ int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
 	return(0);
 }
 
-int _alpm_trans_sysupgrade(pmtrans_t *trans)
-{
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-
-	return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync,
-				&(trans->packages)));
-}
-
 /** Add a target to the transaction.
  * @param trans the current transaction
  * @param target the name of the target to add
diff --git a/lib/libalpm/trans.h b/lib/libalpm/trans.h
index d74c3e90..48996573 100644
--- a/lib/libalpm/trans.h
+++ b/lib/libalpm/trans.h
@@ -71,7 +71,6 @@ void _alpm_trans_free(pmtrans_t *trans);
 int _alpm_trans_init(pmtrans_t *trans, pmtranstype_t type, pmtransflag_t flags,
                      alpm_trans_cb_event event, alpm_trans_cb_conv conv,
                      alpm_trans_cb_progress progress);
-int _alpm_trans_sysupgrade(pmtrans_t *trans);
 int _alpm_trans_addtarget(pmtrans_t *trans, char *target);
 int _alpm_trans_prepare(pmtrans_t *trans, alpm_list_t **data);
 int _alpm_trans_commit(pmtrans_t *trans, alpm_list_t **data);
diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c
index da3463b0..4d682552 100644
--- a/lib/libalpm/util.c
+++ b/lib/libalpm/util.c
@@ -242,7 +242,8 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace)
 int _alpm_lckmk()
 {
 	int fd;
-	char *dir, *ptr;
+	pid_t pid;
+	char *dir, *ptr, *spid = NULL;
 	const char *file = alpm_option_get_lockfile();
 
 	/* create the dir of the lockfile first */
@@ -256,7 +257,17 @@ int _alpm_lckmk()
 
 	while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1
 			&& errno == EINTR);
-	return(fd > 0 ? fd : -1);
+	if(fd > 0) {
+		pid = getpid();
+		size_t len = snprintf(spid, 0, "%ld\n", (long)pid) + 1;
+		spid = malloc(len);
+		snprintf(spid, len, "%ld\n", (long)pid);
+		while(write(fd, (void *)spid, len) == -1 && errno == EINTR);
+		fsync(fd);
+		free(spid);
+		return(fd);
+	}
+	return(-1);
 }
 
 /* Remove a lock file */
diff --git a/pactest/Makefile.am b/pactest/Makefile.am
index ce611f78..64f9a22e 100644
--- a/pactest/Makefile.am
+++ b/pactest/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = tests
+
 check_SCRIPTS = \
 	pactest.py \
 	pmdb.py \
@@ -7,7 +9,6 @@ check_SCRIPTS = \
 	pmrule.py \
 	pmtest.py \
 	util.py \
-	$(wildcard tests/*.py) \
 	vercmptest.sh
 
 noinst_SCRIPTS = $(check_SCRIPTS)
diff --git a/pactest/pmenv.py b/pactest/pmenv.py
index e9d0b4c9..cc433dd0 100755
--- a/pactest/pmenv.py
+++ b/pactest/pmenv.py
@@ -71,9 +71,11 @@ class pmenv:
             t.generate()
             # Hack for mtimes consistency
             for i in t.rules:
-                if i.rule.find("MODIFIED") != -1:
-                    time.sleep(1.5)
-                    break
+                if i.rule.find("FILE_MODIFIED") != -1:
+                    [test, arg] = i.rule.split("=")
+                    for f in t.files:
+                        if f.name == arg:
+                            f.resettimes()
 
             t.run(self.pacman)
 
diff --git a/pactest/pmfile.py b/pactest/pmfile.py
index 21baf017..ab4aa2c7 100755
--- a/pactest/pmfile.py
+++ b/pactest/pmfile.py
@@ -56,6 +56,14 @@ class pmfile:
 
         return retval
 
+    def resettimes(self):
+        """
+        """
+
+        filename = os.path.join(self.root, self.name)
+        os.utime(filename, (355, 355))
+        self.mtime = getmtime(filename)
+        vprint("\tmtime reset (%s)" % self.name)
 
 if __name__ == "__main__":
     f = pmfile("/tmp", "foobar")
diff --git a/pactest/tests/Makefile.am b/pactest/tests/Makefile.am
new file mode 100644
index 00000000..b793687b
--- /dev/null
+++ b/pactest/tests/Makefile.am
@@ -0,0 +1,27 @@
+CONFTESTS = $(patsubst %py.in,%py,$(wildcard *.py.in))
+
+check_SCRIPTS =	\
+	$(wildcard *.py) \
+	$(CONFTESTS)
+
+noinst_SCRIPTS = $(check_SCRIPTS)
+
+EXTRA_DIST = $(check_SCRIPTS)
+
+CLEANFILES = $(CONFTESTS)
+
+#### Taken from the autoconf scripts Makefile.am ####
+edit = sed \
+  -e 's|@LIBS[@]|$(LIBS)|g' \
+  -e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
+
+
+$(CONFTESTS): Makefile
+	@echo '    ' GEN $@;
+	@rm -f $@ $@.tmp
+	@test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true
+	@test -f $@.tmp || false
+	@chmod a-w $@.tmp
+	@mv $@.tmp $@
+
+# vim:set ts=2 sw=2 noet:
diff --git a/pactest/tests/sync200.py b/pactest/tests/sync200.py.in
index 9005bd3d..3c11f83f 100644
--- a/pactest/tests/sync200.py
+++ b/pactest/tests/sync200.py.in
@@ -1,5 +1,8 @@
 self.description = "Synchronize the local database"
 
+if not "download" in "@LIBS@":
+	self.option['XferCommand'] = ['/usr/bin/curl %u > %o']
+
 sp1 = pmpkg("spkg1", "1.0-1")
 sp1.depends = ["spkg2"]
 sp2 = pmpkg("spkg2", "2.0-1")
diff --git a/po/it.po b/po/it.po
index 1829d436..274de509 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacman package manager 3.0.0\n"
 "Report-Msgid-Bugs-To: pacman-dev@archlinux.org\n"
-"POT-Creation-Date: 2009-01-02 22:24-0600\n"
+"POT-Creation-Date: 2008-12-04 23:43-0800\n"
 "PO-Revision-Date: 2008-08-23 19:30+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -33,7 +33,7 @@ msgstr "risoluzione delle dipendenze in corso...\n"
 
 #, c-format
 msgid "looking for inter-conflicts...\n"
-msgstr "ricerca dei conflitti incrociati in corso...\n"
+msgstr "ricerca di conflitti in corso...\n"
 
 #, c-format
 msgid "installing %s...\n"
@@ -53,7 +53,7 @@ msgstr "controllo dell'integrità dei pacchetti in corso...\n"
 
 #, c-format
 msgid "checking delta integrity...\n"
-msgstr "controllo dell'integrità di delta in corso...\n"
+msgstr "controllo dell'integrità del delta in corso...\n"
 
 #, c-format
 msgid "applying deltas...\n"
@@ -73,7 +73,7 @@ msgstr "non riuscito.\n"
 
 #, c-format
 msgid ":: Retrieving packages from %s...\n"
-msgstr ":: Recupero dei pacchetti da %s...\n"
+msgstr ":: Download dei pacchetti da %s...\n"
 
 #, c-format
 msgid ""
@@ -399,7 +399,8 @@ msgstr "  -o, --owns <file>    mostra il pacchetto che contiene il <file>\n"
 #, c-format
 msgid "  -p, --file <package> query a package file instead of the database\n"
 msgstr ""
-"  -p, --file <package> interroga un file del pacchetto invece del database\n"
+"  -p, --file <pacchetto> interroga un file del pacchetto invece del "
+"database\n"
 
 #, c-format
 msgid ""
@@ -414,10 +415,8 @@ msgid "  -t, --unrequired     list all packages not required by any package\n"
 msgstr "  -t, --unrequired     elenca tutti i pacchetti non richiesti\n"
 
 #, c-format
-msgid "  -u, --upgrades       list all packages that can be upgraded\n"
-msgstr ""
-"  -u, --upgrades       elenca tutti i pacchetti che possono essere "
-"aggiornati\n"
+msgid "  -u, --upgrades       list all outdated packages\n"
+msgstr "  -u, --upgrades       elenca tutti i pacchetti non aggiornati\n"
 
 #, c-format
 msgid "  -q, --quiet          show less information for query and search\n"
@@ -537,8 +536,9 @@ msgid ""
 "                       This program may be freely redistributed under\n"
 "                       the terms of the GNU General Public License.\n"
 msgstr ""
-"                       This program may be freely redistributed under\n"
-"                       the terms of the GNU General Public License.\n"
+"                       Questo programma può essere liberamente "
+"ridistribuito\n"
+"                       sotto i termini della GNU General Public License.\n"
 
 #, c-format
 msgid "problem setting rootdir '%s' (%s)\n"
@@ -576,9 +576,9 @@ msgstr "il file di configurazione %s potrebbe non essere leggibile.\n"
 msgid "config file %s, line %d: bad section name.\n"
 msgstr "file di configurazione %s, linea %d: il nome della sezione è errato.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not register '%s' database (%s)\n"
-msgstr "impossibile registrare il database 'local' (%s)\n"
+msgstr "impossibile registrare il database '%s' (%s)\n"
 
 #, c-format
 msgid "config file %s, line %d: syntax error in config file- missing key.\n"
@@ -601,9 +601,9 @@ msgstr ""
 msgid "invalid value for 'CleanMethod' : '%s'\n"
 msgstr "valore invalido per 'CleanMethod' : '%s'\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "could not add server URL to database '%s': %s (%s)\n"
-msgstr "impossibile registrare il database 'local' (%s)\n"
+msgstr "impossibile aggiungere l'URL del server al database '%s': %s (%s)\n"
 
 #, c-format
 msgid "failed to initialize alpm library (%s)\n"
@@ -650,14 +650,6 @@ msgid "group \"%s\" was not found\n"
 msgstr "il gruppo \"%s\" non è stato trovato\n"
 
 #, c-format
-msgid "Checking for package upgrades... \n"
-msgstr "Controllo degli aggiornamenti dei pacchetti in corso... \n"
-
-#, c-format
-msgid "no upgrades found.\n"
-msgstr "non ci sono aggiornamenti.\n"
-
-#, c-format
 msgid "no usable package repositories configured.\n"
 msgstr "non è stato configurato nessun repository di pacchetti valido.\n"
 
@@ -671,7 +663,7 @@ msgstr "il pacchetto \"%s\" non è stato trovato\n"
 
 #, c-format
 msgid "%s not found, searching for group...\n"
-msgstr "%s non è stato trovato. cerco per un gruppo...\n"
+msgstr "%s non è stato trovato, ricerca in corso all'interno di un gruppo...\n"
 
 #, c-format
 msgid "'%s': not found in local db\n"
@@ -739,7 +731,7 @@ msgstr "Rimuovere i pacchetti disinstallati dalla cache?"
 
 #, c-format
 msgid "Do you want to remove outdated packages from cache?"
-msgstr "Rimuovere i pacchetti disinstallati dalla cache?"
+msgstr "Rimuovere i pacchetti non aggiornati dalla cache?"
 
 #, c-format
 msgid "removing old packages from cache... "
@@ -803,7 +795,9 @@ msgstr ":: Aggiornamento del sistema in corso...\n"
 
 #, c-format
 msgid "%s package not found, searching for group...\n"
-msgstr "%s pacchetto non trovato, cerco per un gruppo...\n"
+msgstr ""
+"Il pacchetto %s non è stato trovato, ricerca in corso all'interno di un "
+"gruppo...\n"
 
 #, c-format
 msgid ":: group %s (including ignored packages):\n"
@@ -847,7 +841,7 @@ msgstr "%s: %s è già presente nel filesystem\n"
 
 #, c-format
 msgid "%s is invalid or corrupted\n"
-msgstr "%s è invalido o corrotto\n"
+msgstr "%s non è valido o corrotto\n"
 
 #, c-format
 msgid "Errors occurred, no packages were upgraded.\n"
@@ -891,8 +885,8 @@ msgid ""
 "  if you're sure a package manager is not already\n"
 "  running, you can remove %s\n"
 msgstr ""
-"  se sei sicuro che il gestore dei pacchetti non è già\n"
-"  in funzione, è possibile rimuovere %s.\n"
+"  se sei sicuro che il gestore dei pacchetti non sia già\n"
+"  in esecuzione, puoi rimuovere %s\n"
 
 #, c-format
 msgid "failed to release transaction (%s)\n"
@@ -923,6 +917,10 @@ msgid "Total Removed Size:   %.2f MB\n"
 msgstr "Dimensione totale dei pacchetti da rimuovere:   %.2f MB\n"
 
 #, c-format
+msgid "New optional dependencies for %s\n"
+msgstr "Nuove dipendenze opzionali di %s\n"
+
+#, c-format
 msgid "Optional dependencies for %s\n"
 msgstr "Dipendenze opzionali di %s\n"
 
@@ -994,7 +992,7 @@ msgid "The download program %s is not installed."
 msgstr "Il programma %s per il download non è installato."
 
 msgid "Pacman returned a fatal error (%i): %s"
-msgstr "Pacman ha ritornato un errore fatale (%i): %s"
+msgstr "Pacman ha riportato un errore fatale (%i): %s"
 
 msgid "Installing missing dependencies..."
 msgstr "Installazione delle dipendenze mancanti in corso..."
@@ -1012,7 +1010,7 @@ msgid "Failed to remove installed dependencies."
 msgstr "Impossibile rimuovere le dipendenze installate."
 
 msgid "Retrieving Sources..."
-msgstr "Recupero dei sorgenti in corso..."
+msgstr "Download dei sorgenti in corso..."
 
 msgid "You do not have write permission to store downloads in %s."
 msgstr "Non si dispone dei permessi in scrittura per salvare i download in %s."
@@ -1027,7 +1025,7 @@ msgid "%s was not found in the build directory and is not a URL."
 msgstr "impossibile trovare %s nella directory e non è un URL."
 
 msgid "Downloading %s..."
-msgstr "Scaricamento di %s in corso..."
+msgstr "Download di %s in corso..."
 
 msgid "Failure while downloading %s"
 msgstr "Impossibile scaricare %s"
@@ -1035,18 +1033,15 @@ msgstr "Impossibile scaricare %s"
 msgid "Generating checksums for source files..."
 msgstr "Generazione dei checksum dei sorgenti in corso..."
 
-msgid "Invalid integrity algorithm '%s' specified."
-msgstr "L'algoritmo dell'integrità di '%s' specificato non è valido."
-
 msgid "Cannot find openssl."
 msgstr "Impossibile trovare openssl."
 
+msgid "Invalid integrity algorithm '%s' specified."
+msgstr "L'algoritmo dell'integrità di '%s' specificato non è valido."
+
 msgid "Unable to find source file %s to generate checksum."
 msgstr "Impossibile trovare il file sorgente di %s per generare il checksum."
 
-msgid "Invalid integrity algorithm '%s' specified"
-msgstr "L'algoritmo dell'integrità di '%s' specificato non è valido"
-
 msgid "Validating source files with %s..."
 msgstr "Validazione dei file sorgenti con %s in corso..."
 
@@ -1083,11 +1078,11 @@ msgstr "Compilazione interrotta."
 msgid "Tidying install..."
 msgstr "Rimozione dei dati superflui in corso..."
 
-msgid "Removing info/doc files..."
-msgstr "Rimozione dei file info/doc in corso..."
+msgid "Removing doc files..."
+msgstr "Rimozione dei file doc in corso..."
 
-msgid "Compressing man pages..."
-msgstr "Compressione delle pagine man in corso..."
+msgid "Compressing man and info pages..."
+msgstr "Compressione delle pagine man ed info in corso..."
 
 msgid "Stripping debugging symbols from binaries and libraries..."
 msgstr "Rimozione dei simboli di debug dai binari e dalle librerie in corso..."
@@ -1122,6 +1117,9 @@ msgstr "Aggiunta del changelog del pacchetto in corso..."
 msgid "Compressing package..."
 msgstr "Compressione del pacchetto in corso..."
 
+msgid "'%s' is not a valid archive extension."
+msgstr "'%s' non è una valida estensione di un archivio."
+
 msgid "Failed to create package file."
 msgstr "Impossibile creare il pacchetto."
 
@@ -1182,15 +1180,6 @@ msgstr "Determinazione dell'ultima revisione hg in corso..."
 msgid "Version found: %s"
 msgstr "Versione trovata: %s"
 
-msgid "requires an argument"
-msgstr ""
-
-msgid "unrecognized option"
-msgstr ""
-
-msgid "invalid option"
-msgstr ""
-
 msgid "Usage: %s [options]"
 msgstr "uso:  %s [opzioni]"
 
@@ -1206,6 +1195,9 @@ msgstr "  -c, --clean      Ripulisce i sorgenti dopo la compilazione"
 msgid "  -C, --cleancache Clean up source files from the cache"
 msgstr "  -C, --cleancache Elimina i sorgenti dalla cache"
 
+msgid "  --config <config> Use an alternate config file (instead of '%s')"
+msgstr "  --config <config> Usa un file di config alternativo (invece di '%s')"
+
 msgid "  -d, --nodeps     Skip all dependency checks"
 msgstr "  -d, --nodeps     Ignora i controlli tutte sulle dipendenze"
 
@@ -1322,8 +1314,8 @@ msgstr "La cache del sorgente è stata pulita."
 msgid "No files have been removed."
 msgstr "Non è stato rimosso nessun file."
 
-msgid "Source destination must be defined in makepkg.conf."
-msgstr "La destinazione del sorgente deve essere definita in makepkg.conf."
+msgid "Source destination must be defined in %s."
+msgstr "La destinazione del sorgente deve essere definita in %s."
 
 msgid "In addition, please run makepkg -C outside of your cache directory."
 msgstr ""
@@ -1361,8 +1353,8 @@ msgid "ownership of the packaged files. Try using the fakeroot environment by"
 msgstr ""
 "di proprietà del pacchettizzatore. Provare usando l'ambiente di fakeroot"
 
-msgid "placing 'fakeroot' in the BUILDENV array in makepkg.conf."
-msgstr "posizionando 'fakeroot' nell'array BUILDENV in makepkg.conf."
+msgid "placing 'fakeroot' in the BUILDENV array in %s."
+msgstr "inserendo 'fakeroot' nell'array BUILDENV in %s."
 
 msgid "Do not use the '-F' option. This option is only for use by makepkg."
 msgstr "Non usare l'opzione '-F'. Questa opzione si usa solo con makepkg."
@@ -1400,9 +1392,6 @@ msgstr ""
 msgid "such as arch=('%s')."
 msgstr "come ad esempio arch=('%s')."
 
-msgid "Provides array cannot contain comparison (< or >) operators."
-msgstr ""
-
 msgid "Install scriptlet (%s) does not exist."
 msgstr "Lo script install (%s) non esiste."
 
@@ -1450,7 +1439,7 @@ msgstr ""
 
 msgid "Skipping source retrieval        -- using existing src/ tree"
 msgstr ""
-"Recupero dei sorgenti ignorato        -- utilizzo la directory esistente src/"
+"Download dei sorgenti ignorato        -- utilizzo la directory esistente src/"
 
 msgid "Skipping source integrity checks -- using existing src/ tree"
 msgstr ""
@@ -1533,16 +1522,14 @@ msgstr "Compressione di %s in corso..."
 msgid "Tar'ing up %s failed."
 msgstr "Impossibile comprimere %s."
 
-#, fuzzy
 msgid "Making and MD5sum'ing the new database..."
 msgstr "Creazione del nuovo database e calcolo della somma MD5 in corso..."
 
 msgid "Untar'ing %s failed."
 msgstr "Impossibile decomprimere %s."
 
-#, fuzzy
 msgid "Syncing database to disk..."
-msgstr ":: Sincronizzazione dei database in corso...\n"
+msgstr "Sincronizzazione dei database in corso..."
 
 msgid "Checking integrity..."
 msgstr "Controllo dell'integrità in corso..."
@@ -1552,7 +1539,6 @@ msgstr ""
 "Impossibile effettuare il controllo dell'integrità, ritorno al vecchio "
 "database."
 
-#, fuzzy
 msgid "Rotating database into place..."
 msgstr "Inserimento del nuovo database in corso..."
 
@@ -1560,10 +1546,10 @@ msgid "Finished. Your pacman database has been optimized."
 msgstr "Terminato. Il database del vostro pacman è stato ottimizzato."
 
 msgid "Usage: repo-add [-q] <path-to-db> <package> ...\\n"
-msgstr "uso: repo-add [-q] <path-al-db> <nomepacchetto> ...\\n"
+msgstr "uso: repo-add [-q] <path-del-db> <pacchetto> ...\\n"
 
 msgid "Usage: repo-remove [-q] <path-to-db> <packagename> ...\\n\\n"
-msgstr "Uso: repo-remove [-q]  <path-al-db> <nomepacchetto>...\\n\\n"
+msgstr "Uso: repo-remove [-q]  <path-del-db> <nomepacchetto>...\\n\\n"
 
 msgid ""
 "repo-add will update a package database by reading a package file."
@@ -1634,9 +1620,6 @@ msgstr "Rimozione del pacchetto esistente '%s' in corso..."
 msgid "Either realpath or readlink are required by repo-add."
 msgstr "realpath o readlink è richiesto da repo-add."
 
-msgid "%s not found. Cannot continue."
-msgstr "%s non è stato trovato. Impossibile continuare."
-
 msgid "Cannot create temp directory for database building."
 msgstr "Impossibile creare la directory temp per creare il database."
 
@@ -1676,8 +1659,8 @@ msgstr "Non è stato trovato nessun pacchetto corrispondente a '%s'."
 msgid "Creating updated database file '%s'"
 msgstr "Creazione di un database aggiornato di '%s'"
 
-msgid "No compression set."
-msgstr "Non è stata impostata nessuna compressione."
+msgid "'%s' does not have a valid archive extension."
+msgstr "'%s' non è una valida estensione di un archivio."
 
 msgid "All packages have been removed from the database. Deleting '%s'."
 msgstr ""
@@ -1685,18 +1668,4 @@ msgstr ""
 "corso."
 
 msgid "No packages modified, nothing to do."
-msgstr "Non è stato modificato alcun pacchetto."
-
-#~ msgid "segmentation fault\n"
-#~ msgstr "segmentation fault\n"
-
-#~ msgid ""
-#~ "Internal pacman error: Segmentation fault.\n"
-#~ "Please submit a full bug report with --debug if appropriate.\n"
-#~ msgstr ""
-#~ "Errore interno in pacman: Segmentation fault.\n"
-#~ "Invia un report del bug completo usando --debug se necessario.\n"
-
-#~ msgid "For full benefits of pacman-optimize, run 'sync' now."
-#~ msgstr ""
-#~ "Per migliorare le prestazioni di pacman-optimize, avviare 'sync' adesso."
+msgstr "Non è stato modificato nessun pacchetto."
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 10e179e1..d6d9bb93 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -37,6 +37,7 @@ edit = sed \
 	-e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \
 	-e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \
 	-e 's|@DBEXT[@]|$(DBEXT)|g' \
+	-e 's|@BUILDSCRIPT[@]|$(BUILDSCRIPT)|g' \
 	-e 's|@SIZECMD[@]|$(SIZECMD)|g' \
 	-e 's|@configure_input[@]|Generated from $@.in; do not edit by hand.|g'
 
@@ -46,13 +47,14 @@ edit = sed \
 # two 'test' lines- make sure we can handle both sh and py type scripts
 # third 'test' line- make sure one of the two checks succeeded
 $(OURSCRIPTS): Makefile
-	rm -f $@ $@.tmp
-	test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true
-	test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true
-	test -f $@.tmp || false
-	chmod +x $@.tmp
-	chmod a-w $@.tmp
-	mv $@.tmp $@
+	@echo '    ' GEN $@;
+	@rm -f $@ $@.tmp
+	@test -f $(srcdir)/$@.sh.in && $(edit) $(srcdir)/$@.sh.in >$@.tmp || true
+	@test -f $(srcdir)/$@.py.in && $(edit) $(srcdir)/$@.py.in >$@.tmp || true
+	@test -f $@.tmp || false
+	@chmod +x $@.tmp
+	@chmod a-w $@.tmp
+	@mv $@.tmp $@
 
 makepkg: $(srcdir)/makepkg.sh.in
 pacman-optimize: $(srcdir)/pacman-optimize.sh.in
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 04d2aca1..3e0781f5 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -38,11 +38,13 @@ export COMMAND_MODE='legacy'
 
 myver='@PACKAGE_VERSION@'
 confdir='@sysconfdir@'
+BUILDSCRIPT='@BUILDSCRIPT@'
 startdir="$PWD"
 srcdir="$startdir/src"
 pkgdir="$startdir/pkg"
-known_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'ccache' 'distcc' 'makeflags' 'force')
-readonly -a known_options
+packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge')
+other_options=('ccache' 'distcc' 'makeflags' 'force')
+readonly -a packaging_options other_options
 
 # Options
 ASROOT=0
@@ -278,7 +280,7 @@ get_downloadclient() {
 
 	# if we didn't find an agent, return an error
 	if [ -z "$agent" ]; then
-		error "$(gettext "There is no agent set up to handle %s URLs. Check %s.")" "$proto" "$confdir/makepkg.conf"
+		error "$(gettext "There is no agent set up to handle %s URLs. Check %s.")" "$proto" "$MAKEPKG_CONF"
 		plain "$(gettext "Aborting...")"
 		exit 1 # $E_CONFIG_ERROR
 	fi
@@ -488,6 +490,11 @@ generate_checksums() {
 	msg "$(gettext "Generating checksums for source files...")"
 	plain ""
 
+	if [ ! $(type -p openssl) ]; then
+		error "$(gettext "Cannot find openssl.")"
+		exit 1 # $E_MISSING_PROGRAM
+	fi
+
 	local integ
 	for integ in ${INTEGRITY_CHECK[@]}; do
 		integ="$(echo $integ | tr '[:upper:]' '[:lower:]')"
@@ -498,11 +505,6 @@ generate_checksums() {
 				exit 1;; # $E_CONFIG_ERROR
 		esac
 
-		if [ ! $(type -p openssl) ]; then
-			error "$(gettext "Cannot find openssl.")"
-			exit 1 # $E_MISSING_PROGRAM
-		fi
-
 		local ct=0
 		local numsrc=${#source[@]}
 		echo -n "${integ}sums=("
@@ -540,21 +542,13 @@ generate_checksums() {
 }
 
 check_checksums() {
-	local integ
-	for integ in ${INTEGRITY_CHECK[@]}; do
-		integ="$(echo $integ | tr '[:upper:]' '[:lower:]')"
-		case "$integ" in
-			md5|sha1|sha256|sha384|sha512) : ;;
-			*)
-				error "$(gettext "Invalid integrity algorithm '%s' specified")" "$integ"
-				exit 1;; # $E_CONFIG_ERROR
-		esac
-
-		if [ ! $(type -p openssl) ]; then
-			error "$(gettext "Cannot find openssl.")"
-			exit 1 # $E_MISSING_PROGRAM
-		fi
+	if [ ! $(type -p openssl) ]; then
+		error "$(gettext "Cannot find openssl.")"
+		exit 1 # $E_MISSING_PROGRAM
+	fi
 
+	local integ required
+	for integ in md5 sha1 sha256 sha384 sha512; do
 		local integrity_sums=($(eval echo "\${${integ}sums[@]}"))
 		if [ ${#integrity_sums[@]} -eq ${#source[@]} ]; then
 			msg "$(gettext "Validating source files with %s...")" "${integ}sums"
@@ -592,7 +586,13 @@ check_checksums() {
 				exit 1 # TODO: error code
 			fi
 		else
-			warning "$(gettext "Integrity checks (%s) are missing or incomplete.")" "$integ"
+			for required in ${INTEGRITY_CHECK[@]}; do
+				required="$(echo $required | tr '[:upper:]' '[:lower:]')"
+				if [ "$integ" = "$required" ]; then
+					warning "$(gettext "Integrity checks (%s) are missing or incomplete.")" "$integ"
+					break
+				fi
+			done
 		fi
 	done
 }
@@ -674,7 +674,7 @@ run_build() {
 	cd "$srcdir"
 
 	# ensure all necessary build variables are exported
-	export CFLAGS CXXFLAGS MAKEFLAGS CHOST
+	export CFLAGS CXXFLAGS MAKEFLAGS LDFLAGS CHOST
 	# save our shell options so build() can't override what we need
 	local shellopts=$(shopt -p)
 
@@ -713,16 +713,31 @@ tidy_install() {
 	msg "$(gettext "Tidying install...")"
 
 	if [ "$(check_option docs)" = "n" ]; then
-		msg2 "$(gettext "Removing info/doc files...")"
+		msg2 "$(gettext "Removing doc files...")"
 		#fix flyspray bug #5021
 		rm -rf ${DOC_DIRS[@]}
 	fi
 
+	if [ "$(check_option purge)" = "y" -a -n "PURGE_TARGETS" ]; then
+		msg2 "$(gettext "Removing pugre targets...")"
+		local pt
+		for pt in "${PURGE_TARGETS[@]}"; do
+			if [ "${pt}" == "${pt//\/}" ]; then
+				find . -type f -name "${pt}" -exec rm -f -- '{}' \;
+			else
+				rm -f ${pt}
+			fi
+		done
+	fi
+
 	if [ "$(check_option zipman)" = "y" ]; then
-		msg2 "$(gettext "Compressing man pages...")"
-		local manpage mandirs ext file link hardlinks hl
-		mandirs="usr/man usr/share/man usr/local/man usr/local/share/man opt/*/man"
-		find ${mandirs} -type f 2>/dev/null |
+		msg2 "$(gettext "Compressing man and info pages...")"
+		local manpage ext file link hardlinks hl
+		if [ -z "${MAN_DIRS[*]}" ]; then
+			# fall back to default value
+			MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info})
+		fi
+		find ${MAN_DIRS[@]} -type f 2>/dev/null |
 		while read manpage ; do
 			# check file still exists (potentially compressed with hard link)
 			if [ -f ${manpage} ]; then
@@ -730,7 +745,7 @@ tidy_install() {
 				file="${manpage##*/}"
 				if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then
 					# update symlinks to this manpage
-					find ${mandirs} -lname "$file" 2>/dev/null |
+					find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null |
 					while read link ; do
 						rm -f "$link"
 						ln -sf "${file}.gz" "${link}.gz"
@@ -738,7 +753,7 @@ tidy_install() {
 					# find hard links and remove them
 					#   the '|| true' part keeps the script from bailing if find returned an
 					#   error, such as when one of the man directories doesn't exist
-					hardlinks="$(find ${mandirs} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true
+					hardlinks="$(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" 2>/dev/null)" || true
 					for hl in ${hardlinks}; do
 						rm -f "${hl}";
 					done
@@ -754,7 +769,6 @@ tidy_install() {
 		done
 	fi
 
-
 	if [ "$(check_option strip)" = "y" ]; then
 		msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")"
 		local binary
@@ -850,6 +864,16 @@ create_package() {
 	for it in "${backup[@]}"; do
 		echo "backup = $it" >>.PKGINFO
 	done
+	for it in "${packaging_options[@]}"; do
+		local ret="$(check_option $it)"
+		if [ "$ret" != "?" ]; then
+			if [ "$ret" = "y" ]; then
+				echo "makepkgopt = $it" >>.PKGINFO
+			else
+				echo "makepkgopt = !$it" >>.PKGINFO
+			fi
+		fi
+	done
 
 	# TODO maybe remove this at some point
 	# warn if license array is not present or empty
@@ -877,13 +901,21 @@ create_package() {
 	# tar it up
 	msg2 "$(gettext "Compressing package...")"
 
+	local TAR_OPT
+	case "$PKGEXT" in
+		*tar.gz)  TAR_OPT="z" ;;
+		*tar.bz2) TAR_OPT="j" ;;
+		*) warning "$(gettext "'%s' is not a valid archive extension.")" \
+		"$PKGEXT" ;;
+	esac
+
 	local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}"
 
 	# when fileglobbing, we want * in an empty directory to expand to
 	# the null string rather than itself
 	shopt -s nullglob
 
-	if ! bsdtar -czf "$pkg_file" $comp_files *; then
+	if ! bsdtar -c${TAR_OPT}f "$pkg_file" $comp_files *; then
 		error "$(gettext "Failed to create package file.")"
 		exit 1 # TODO: error code
 	fi
@@ -998,12 +1030,20 @@ create_srcpackage() {
 		fi
 	done
 
+	local TAR_OPT
+	case "$SRCEXT" in
+		*tar.gz)  TAR_OPT="z" ;;
+		*tar.bz2) TAR_OPT="j" ;;
+		*) warning "$(gettext "'%s' is not a valid archive extension.")" \
+		"$SRCEXT" ;;
+	esac
+
 	local pkg_file="$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}"
 
 	# tar it up
 	msg2 "$(gettext "Compressing source package...")"
 	cd "${srclinks}"
-	if ! bsdtar -czLf "$pkg_file" ${pkgname}; then
+	if ! bsdtar -c${TAR_OPT}Lf "$pkg_file" ${pkgname}; then
 		error "$(gettext "Failed to create source package file.")"
 		exit 1 # TODO: error code
 	fi
@@ -1027,6 +1067,10 @@ devel_check() {
 	if [ "$HOLDVER" = "1" ]; then
 		return
 	fi
+	# Cannot update pkgver/pkgrel if reading PKGBUILD from pipe
+	if [ ! -f "./$BUILDSCRIPT" ]; then
+		return
+	fi
 	if [ "$FORCE_VER" = "" ]; then
 		# Check if this is a svn/cvs/etc PKGBUILD; set $newpkgver if so.
 		# This will only be used on the first call to makepkg; subsequent
@@ -1094,9 +1138,11 @@ devel_update() {
 	#
 	if [ "$newpkgver" != "" ]; then
 		if [ "$newpkgver" != "$pkgver" ]; then
-			sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT"
-			sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT"
-			source "$BUILDSCRIPT"
+			if [ -f "./$BUILDSCRIPT" ]; then
+				sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "./$BUILDSCRIPT"
+				sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" "./$BUILDSCRIPT"
+				source "$BUILDSCRIPT"
+			fi
 		fi
 	fi
 }
@@ -1197,6 +1243,7 @@ usage() {
 	printf "$(gettext "  -A, --ignorearch Ignore incomplete arch field in %s")\n" "$BUILDSCRIPT"
 	echo "$(gettext "  -c, --clean      Clean up work files after build")"
 	echo "$(gettext "  -C, --cleancache Clean up source files from the cache")"
+	printf "$(gettext "  --config <config> Use an alternate config file (instead of '%s')")\n" "$confdir/makepkg.conf"
 	echo "$(gettext "  -d, --nodeps     Skip all dependency checks")"
 	echo "$(gettext "  -e, --noextract  Do not extract source files (use existing src/ dir)")"
 	echo "$(gettext "  -f, --force      Overwrite existing package")"
@@ -1244,36 +1291,12 @@ fi
 
 ARGLIST=$@
 
-#preserve environment variables
-_PKGDEST=${PKGDEST}
-_SRCDEST=${SRCDEST}
-
-# Source makepkg.conf; fail if it is not found
-if [ -r "$confdir/makepkg.conf" ]; then
-	source "$confdir/makepkg.conf"
-else
-	error "$(gettext "%s not found.")" "$confdir/makepkg.conf"
-	plain "$(gettext "Aborting...")"
-	exit 1 # $E_CONFIG_ERROR
-fi
-
-# Source user-specific makepkg.conf overrides
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
-# override settings with an environment variable for batch processing
-PKGDEST=${_PKGDEST:-$PKGDEST}
-PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
-SRCDEST=${_SRCDEST:-$SRCDEST}
-SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined
-
 # Parse Command Line Options.
 OPT_SHORT="AbcCdefFghiLmop:rRsV"
 OPT_LONG="allsource,asroot,ignorearch,builddeps,clean,cleancache,nodeps"
 OPT_LONG="$OPT_LONG,noextract,force,forcever:,geninteg,help,holdver"
 OPT_LONG="$OPT_LONG,install,log,nocolor,nobuild,rmdeps,repackage,source"
-OPT_LONG="$OPT_LONG,syncdeps,version"
+OPT_LONG="$OPT_LONG,syncdeps,version,config:"
 # Pacman Options
 OPT_LONG="$OPT_LONG,noconfirm,noprogressbar"
 OPT_TEMP="$(parse_options $OPT_SHORT $OPT_LONG "$@" || echo 'PARSE_OPTIONS FAILED')"
@@ -1296,6 +1319,7 @@ while true; do
 		-A|--ignorearch)  IGNOREARCH=1 ;;
 		-c|--clean)       CLEANUP=1 ;;
 		-C|--cleancache)  CLEANCACHE=1 ;;
+		--config)         shift; MAKEPKG_CONF=$1 ;;
 		-d|--nodeps)      NODEPS=1 ;;
 		-e|--noextract)   NOEXTRACT=1 ;;
 		-f|--force)       FORCE=1 ;;
@@ -1323,6 +1347,34 @@ while true; do
 	shift
 done
 
+#preserve environment variables
+_PKGDEST=${PKGDEST}
+_SRCDEST=${SRCDEST}
+
+# default config is makepkg.conf
+MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf}
+
+# Source the config file; fail if it is not found
+if [ -r "$MAKEPKG_CONF" ]; then
+	source "$MAKEPKG_CONF"
+else
+	error "$(gettext "%s not found.")" "$MAKEPKG_CONF"
+	plain "$(gettext "Aborting...")"
+	exit 1 # $E_CONFIG_ERROR
+fi
+
+# Source user-specific makepkg.conf overrides
+if [ -r ~/.makepkg.conf ]; then
+	source ~/.makepkg.conf
+fi
+
+# override settings with an environment variable for batch processing
+PKGDEST=${_PKGDEST:-$PKGDEST}
+PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
+SRCDEST=${_SRCDEST:-$SRCDEST}
+SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined
+
+
 if [ "$HOLDVER" = "1" -a "$FORCE_VER" != "" ]; then
 	# The '\\0' is here to prevent gettext from thinking --holdver is an option
 	error "$(gettext "\\0--holdver and --forcever cannot both be specified" )"
@@ -1354,14 +1406,14 @@ if [ "$CLEANCACHE" = "1" ]; then
 		fi
 	else
 		# $SRCDEST is $startdir, two possibilities
-		error "$(gettext "Source destination must be defined in makepkg.conf.")"
+		error "$(gettext "Source destination must be defined in %s.")" "$MAKEPKG_CONF"
 		plain "$(gettext "In addition, please run makepkg -C outside of your cache directory.")"
 		exit 1
 	fi
 fi
 
 if [ -z "$BUILDSCRIPT" ]; then
-	error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$confdir/makepkg.conf"
+	error "$(gettext "BUILDSCRIPT is undefined! Ensure you have updated %s.")" "$MAKEPKG_CONF"
 	exit 1
 fi
 
@@ -1380,13 +1432,13 @@ if [ "$INFAKEROOT" = "0" ]; then
 	elif [ "$(check_buildenv fakeroot)" = "y" -a $EUID -gt 0 ]; then
 		if [ ! $(type -p fakeroot) ]; then
 			error "$(gettext "Fakeroot must be installed if using the 'fakeroot' option")"
-			plain "$(gettext "in the BUILDENV array in %s.")" "$confdir/makepkg.conf"
+			plain "$(gettext "in the BUILDENV array in %s.")" "$MAKEPKG_CONF"
 			exit 1
 		fi
 	elif [ $EUID -gt 0 ]; then
 		warning "$(gettext "Running makepkg as an unprivileged user will result in non-root")"
 		plain "$(gettext "ownership of the packaged files. Try using the fakeroot environment by")"
-		plain "$(gettext "placing 'fakeroot' in the BUILDENV array in makepkg.conf.")"
+		plain "$(gettext "placing 'fakeroot' in the BUILDENV array in %s.")" "$MAKEPKG_CONF"
 		sleep 1
 	fi
 else
@@ -1412,8 +1464,19 @@ unset replaces depends conflicts backup source install build makedepends
 unset optdepends options noextract
 
 if [ ! -f "$BUILDSCRIPT" ]; then
-	error "$(gettext "%s does not exist.")" "$BUILDSCRIPT"
-	exit 1
+	if [ -t 0 ]; then
+		error "$(gettext "%s does not exist.")" "$BUILDSCRIPT"
+		exit 1
+	else
+		# PKGBUILD passed through a pipe
+		BUILDSCRIPT=/dev/stdin
+	fi
+else
+	crlftest=$(file $BUILDSCRIPT | grep -F 'CRLF' || true)
+	if [ "$crlftest" != "" ]; then
+		error "$(gettext "%s contains CRLF characters and cannot be sourced.")" "$BUILDSCRIPT"
+		exit 1
+	fi
 fi
 
 source "$BUILDSCRIPT"
@@ -1458,10 +1521,6 @@ if ! in_array $CARCH ${arch[@]}; then
 		plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT"
 		plain "$(gettext "such as arch=('%s').")" "$CARCH"
 		exit 1
-	else
-		warning "$(gettext "%s is not available for the '%s' architecture.")" "$pkgname" "$CARCH"
-		plain "$(gettext "Note that many packages may need a line added to their %s")" "$BUILDSCRIPT"
-		plain "$(gettext "such as arch=('%s').")" "$CARCH"
 	fi
 fi
 
@@ -1482,7 +1541,7 @@ valid_options=1
 for opt in ${options[@]}; do
 	known=0
 	# check if option matches a known option or its inverse
-	for kopt in ${known_options[@]}; do
+	for kopt in ${packaging_options[@]} ${other_options[@]}; do
 		if [ "${opt}" = "${kopt}" -o "${opt}" = "!${kopt}" ]; then
 			known=1
 		fi
@@ -1517,11 +1576,8 @@ if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}" \
 fi
 
 # Run the bare minimum in fakeroot
-# fix flyspray bug 6208 -- using makepkg with fakeroot gives an error
 if [ "$INFAKEROOT" = "1" ]; then
-	if [ "$REPKG" = "1" ]; then
-		warning "$(gettext "Skipping build.")"
-	else
+	if [ "$REPKG" = "0" ]; then
 		run_build
 		tidy_install
 	fi
@@ -1534,10 +1590,6 @@ fi
 
 msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel $CARCH ($(date))"
 
-if [ $EUID -eq 0 ]; then
-	warning "$(gettext "Running makepkg as root...")"
-fi
-
 # if we are creating a source-only package, go no further
 if [ "$SOURCEONLY" != "0" ]; then
 	if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \
@@ -1552,10 +1604,10 @@ fi
 
 # fix flyspray bug #5973
 if [ "$NODEPS" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then
+	# no warning message needed for nobuild, repkg
 	if [ "$NODEPS" = "1" ]; then
 		warning "$(gettext "Skipping dependency checks.")"
 	fi
-	# skip printing a warning message for the others: nobuild, repkg
 elif [ $(type -p pacman) ]; then
 	unset pkgdeps # Set by resolve_deps() and used by remove_deps()
 	deperr=0
@@ -1581,7 +1633,7 @@ umask 0022
 mkdir -p "$srcdir"
 cd "$srcdir"
 
-if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then
+if [ "$NOEXTRACT" = "1" ]; then
 	warning "$(gettext "Skipping source retrieval        -- using existing src/ tree")"
 	warning "$(gettext "Skipping source integrity checks -- using existing src/ tree")"
 	warning "$(gettext "Skipping source extraction       -- using existing src/ tree")"
@@ -1590,11 +1642,11 @@ if [ "$NOEXTRACT" = "1" -o "$REPKG" = "1" ]; then
 		error "$(gettext "The source directory is empty, there is nothing to build!")"
 		plain "$(gettext "Aborting...")"
 		exit 1
-	elif [ "$REPKG" = "1" -a \( ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" \) ]; then
-		error "$(gettext "The package directory is empty, there is nothing to repackage!")"
-		plain "$(gettext "Aborting...")"
-		exit 1
 	fi
+elif [ "$REPKG" = "1" -a \( ! -d "$pkgdir" -o "$(ls "$pkgdir" 2>/dev/null)" = "" \) ]; then
+	error "$(gettext "The package directory is empty, there is nothing to repackage!")"
+	plain "$(gettext "Aborting...")"
+	exit 1
 else
 	download_sources
 	check_checksums
@@ -1613,11 +1665,9 @@ else
 	mkdir -p "$pkgdir"
 	cd "$startdir"
 
+	# if we are root or if fakeroot is not enabled, then we don't use it
 	if [ "$(check_buildenv fakeroot)" != "y" -o $EUID -eq 0 ]; then
-		# if we are root or if fakeroot is not enabled, then we don't use it
-		if [ "$REPKG" = "1" ]; then
-			warning "$(gettext "Skipping build.")"
-		else
+		if [ "$REPKG" = "0" ]; then
 			devel_update
 			run_build
 			tidy_install
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index be0859ea..4f9639ca 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -305,18 +305,6 @@ else
 	exit 1 # $E_MISSING_PROGRAM
 fi
 
-# source system and user makepkg.conf
-if [ -r "$confdir/makepkg.conf" ]; then
-	source "$confdir/makepkg.conf"
-else
-	error "$(gettext "%s not found. Cannot continue.")" "$confdir/makepkg.conf"
-	exit 1 # $E_CONFIG_ERROR
-fi
-
-if [ -r ~/.makepkg.conf ]; then
-	source ~/.makepkg.conf
-fi
-
 # main routine
 gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\
 	error "$(gettext "Cannot create temp directory for database building.")"; \
@@ -387,10 +375,11 @@ if [ $success -eq 1 ]; then
 		[ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old"
 		[ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old"
 
-		case "$DB_COMPRESSION" in
-			gz)  TAR_OPT="z" ;;
-			bz2) TAR_OPT="j" ;;
-			*)   warning "$(gettext "No compression set.")" ;;
+		case "$REPO_DB_FILE" in
+			*tar.gz)  TAR_OPT="z" ;;
+			*tar.bz2) TAR_OPT="j" ;;
+			*) warning "$(gettext "'%s' does not have a valid archive extension.")" \
+			           "$REPO_DB_FILE" ;;
 		esac
 
 		bsdtar -c${TAR_OPT}f "$REPO_DB_FILE" *
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 6f41df7c..9f1cca89 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -201,7 +201,7 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 			         (char *)alpm_pkg_get_name(data1),
 			         (char *)alpm_pkg_get_version(data2),
 			         (char *)alpm_pkg_get_version(data1));
-			display_optdepends(data1);
+			display_new_optdepends(data2,data1);
 			break;
 		case PM_TRANS_EVT_INTEGRITY_START:
 			printf(_("checking package integrity...\n"));
@@ -224,9 +224,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2)
 		case PM_TRANS_EVT_SCRIPTLET_INFO:
 			printf("%s", (char*)data1);
 			break;
-		case PM_TRANS_EVT_PRINTURI:
-			printf("%s/%s\n", (char*)data1, (char*)data2);
-			break;
 		case PM_TRANS_EVT_RETRIEVE_START:
 			printf(_(":: Retrieving packages from %s...\n"), (char*)data1);
 			break;
@@ -253,33 +250,33 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
 		case PM_TRANS_CONV_INSTALL_IGNOREPKG:
 			if(data2) {
 				/* TODO we take this route based on data2 being not null? WTF */
-				*response = yesno(1, _(":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"),
+				*response = yesno(_(":: %s requires installing %s from IgnorePkg/IgnoreGroup. Install anyway?"),
 						alpm_pkg_get_name(data2),
 						alpm_pkg_get_name(data1));
 			} else {
-				*response = yesno(1, _(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
+				*response = yesno(_(":: %s is in IgnorePkg/IgnoreGroup. Install anyway?"),
 						alpm_pkg_get_name(data1));
 			}
 			break;
 		case PM_TRANS_CONV_REMOVE_HOLDPKG:
-			*response = yesno(1, _(":: %s is designated as a HoldPkg. Remove anyway?"),
+			*response = yesno(_(":: %s is designated as a HoldPkg. Remove anyway?"),
 					alpm_pkg_get_name(data1));
 			break;
 		case PM_TRANS_CONV_REPLACE_PKG:
-			*response = yesno(1, _(":: Replace %s with %s/%s?"),
+			*response = yesno(_(":: Replace %s with %s/%s?"),
 					alpm_pkg_get_name(data1),
 					(char *)data3,
 					alpm_pkg_get_name(data2));
 			break;
 		case PM_TRANS_CONV_CONFLICT_PKG:
-			*response = yesno(1, _(":: %s conflicts with %s. Remove %s?"),
+			*response = yesno(_(":: %s conflicts with %s. Remove %s?"),
 					(char *)data1,
 					(char *)data2,
 					(char *)data2);
 			break;
 		case PM_TRANS_CONV_LOCAL_NEWER:
 			if(!config->op_s_downloadonly) {
-				*response = yesno(1, _(":: %s-%s: local version is newer. Upgrade anyway?"),
+				*response = yesno(_(":: %s-%s: local version is newer. Upgrade anyway?"),
 						alpm_pkg_get_name(data1),
 						alpm_pkg_get_version(data1));
 			} else {
@@ -287,7 +284,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2,
 			}
 			break;
 		case PM_TRANS_CONV_CORRUPTED_PKG:
-			*response = yesno(1, _(":: File %s is corrupted. Do you want to delete it?"),
+			*response = yesno(_(":: File %s is corrupted. Do you want to delete it?"),
 					(char *)data1);
 			break;
 	}
diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 48c927bf..5853facc 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -44,10 +44,6 @@ config_t *config_new(void)
 	newconfig->logmask = PM_LOG_ERROR | PM_LOG_WARNING;
 	/* CONFFILE is defined at compile-time */
 	newconfig->configfile = strdup(CONFFILE);
-	newconfig->rootdir = NULL;
-	newconfig->dbpath = NULL;
-	newconfig->logfile = NULL;
-	newconfig->syncfirst = NULL;
 
 	return(newconfig);
 }
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 9d2318df..8ea66629 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -57,6 +57,7 @@ typedef struct __config_t {
 	unsigned short op_s_sync;
 	unsigned short op_s_search;
 	unsigned short op_s_upgrade;
+	unsigned short op_s_printuris;
 
 	unsigned short group;
 	pmtransflag_t flags;
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index c7db3b48..3255cdf0 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -113,7 +113,7 @@ static void usage(int op, const char * const myname)
 			printf(_("  -p, --file <package> query a package file instead of the database\n"));
 			printf(_("  -s, --search <regex> search locally-installed packages for matching strings\n"));
 			printf(_("  -t, --unrequired     list all packages not required by any package\n"));
-			printf(_("  -u, --upgrades       list all packages that can be upgraded\n"));
+			printf(_("  -u, --upgrades       list all outdated packages\n"));
 			printf(_("  -q, --quiet          show less information for query and search\n"));
 		} else if(op == PM_OP_SYNC) {
 			printf("%s:  %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg);
@@ -478,7 +478,8 @@ static int parseargs(int argc, char *argv[])
 			case 'o': config->op_q_owns = 1; break;
 			case 'p':
 				config->op_q_isfile = 1;
-				config->flags |= PM_TRANS_FLAG_PRINTURIS;
+				config->op_s_printuris = 1;
+				config->flags |= PM_TRANS_FLAG_NOCONFLICTS;
 				break;
 			case 'q':
 				config->quiet = 1;
diff --git a/src/pacman/query.c b/src/pacman/query.c
index d899539f..0d48638f 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -103,7 +103,7 @@ static int query_fileowner(alpm_list_t *targets)
 
 		root = alpm_option_get_root();
 
-		for(i = alpm_db_getpkgcache(db_local); i && !found; i = alpm_list_next(i)) {
+		for(i = alpm_db_get_pkgcache(db_local); i && !found; i = alpm_list_next(i)) {
 			pmpkg_t *info = alpm_list_getdata(i);
 
 			for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) {
@@ -154,7 +154,7 @@ static int query_search(alpm_list_t *targets)
 		searchlist = alpm_db_search(db_local, targets);
 		freelist = 1;
 	} else {
-		searchlist = alpm_db_getpkgcache(db_local);
+		searchlist = alpm_db_get_pkgcache(db_local);
 		freelist = 0;
 	}
 	if(searchlist == NULL) {
@@ -215,7 +215,7 @@ static int query_group(alpm_list_t *targets)
 	char *grpname = NULL;
 	int ret = 0;
 	if(targets == NULL) {
-		for(j = alpm_db_getgrpcache(db_local); j; j = alpm_list_next(j)) {
+		for(j = alpm_db_get_grpcache(db_local); j; j = alpm_list_next(j)) {
 			pmgrp_t *grp = alpm_list_getdata(j);
 			const alpm_list_t *p, *packages;
 			const char *grpname;
@@ -251,24 +251,6 @@ static int query_group(alpm_list_t *targets)
 	return ret;
 }
 
-static int query_upgrades(void)
-{
-	alpm_list_t *syncpkgs = NULL;
-	printf(_("Checking for package upgrades... \n"));
-
-	alpm_list_t *syncdbs = alpm_option_get_syncdbs();
-	if(alpm_sync_sysupgrade(db_local, syncdbs, &syncpkgs) == -1) {
-		return(-1);
-	}
-	if(syncpkgs) {
-		display_synctargets(syncpkgs);
-		return(0);
-	}
-
-	printf(_("no upgrades found.\n"));
-	return(1);
-}
-
 static int is_foreign(pmpkg_t *pkg)
 {
 	const char *pkgname = alpm_pkg_get_name(pkg);
@@ -320,6 +302,10 @@ static int filter(pmpkg_t *pkg)
 	if(config->op_q_unrequired && !is_unrequired(pkg)) {
 		return(0);
 	}
+	/* check if this pkg is outdated */
+	if(config->op_q_upgrade && (alpm_sync_newversion(pkg, alpm_option_get_syncdbs()) == NULL)) {
+		return(0);
+	}
 	return(1);
 }
 
@@ -361,12 +347,6 @@ int pacman_query(alpm_list_t *targets)
 		return(ret);
 	}
 
-	/* check for package upgrades */
-	if(config->op_q_upgrade) {
-		ret = query_upgrades();
-		return(ret);
-	}
-
 	/* looking for groups */
 	if(config->group) {
 		ret = query_group(targets);
@@ -391,7 +371,7 @@ int pacman_query(alpm_list_t *targets)
 			return(1);
 		}
 
-		for(i = alpm_db_getpkgcache(db_local); i; i = alpm_list_next(i)) {
+		for(i = alpm_db_get_pkgcache(db_local); i; i = alpm_list_next(i)) {
 			pmpkg_t *pkg = alpm_list_getdata(i);
 			if(filter(pkg)) {
 				display(pkg);
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index f091fa4d..b70f7035 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -75,10 +75,10 @@ int pacman_remove(alpm_list_t *targets)
 					}
 					printf(_(":: group %s:\n"), targ);
 					list_display("   ", pkgnames);
-					int all = yesno(1, _("    Remove whole content?"));
+					int all = yesno(_("    Remove whole content?"));
 					for(p = pkgnames; p; p = alpm_list_next(p)) {
 						char *pkgn = alpm_list_getdata(p);
-						if(all || yesno(1, _(":: Remove %s from group %s?"), pkgn, targ)) {
+						if(all || yesno(_(":: Remove %s from group %s?"), pkgn, targ)) {
 							if(alpm_trans_addtarget(pkgn) == -1) {
 								pm_fprintf(stderr, PM_LOG_ERROR, "'%s': %s\n", targ,
 								           alpm_strerrorlast());
@@ -131,7 +131,7 @@ int pacman_remove(alpm_list_t *targets)
 		printf("\n");
 
 		/* get confirmation */
-		if(yesno(1, _("Do you want to remove these packages?")) == 0) {
+		if(yesno(_("Do you want to remove these packages?")) == 0) {
 			retval = 1;
 			goto cleanup;
 		}
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 00e477af..e3a772de 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -85,7 +85,7 @@ static int sync_cleandb(const char *dbpath, int keep_used) {
 		/* We have a directory that doesn't match any syncdb.
 		 * Ask the user if he wants to remove it. */
 		if(!found) {
-			if(!yesno(1, _("Do you want to remove %s?"), path)) {
+			if(!yesno(_("Do you want to remove %s?"), path)) {
 				continue;
 			}
 
@@ -105,7 +105,7 @@ static int sync_cleandb_all(void) {
 	char newdbpath[PATH_MAX];
 
 	printf(_("Database directory: %s\n"), dbpath);
-	if(!yesno(1, _("Do you want to remove unused repositories?"))) {
+	if(!yesno(_("Do you want to remove unused repositories?"))) {
 		return(0);
 	}
 	/* The sync dbs were previously put in dbpath/, but are now in dbpath/sync/,
@@ -135,12 +135,12 @@ static int sync_cleancache(int level)
 		printf(_("Cache directory: %s\n"), cachedir);
 		switch(config->cleanmethod) {
 			case PM_CLEAN_KEEPINST:
-				if(!yesno(1, _("Do you want to remove uninstalled packages from cache?"))) {
+				if(!yesno(_("Do you want to remove uninstalled packages from cache?"))) {
 					return(0);
 				}
 				break;
 			case PM_CLEAN_KEEPCUR:
-				if(!yesno(1, _("Do you want to remove outdated packages from cache?"))) {
+				if(!yesno(_("Do you want to remove outdated packages from cache?"))) {
 					return(0);
 				}
 				break;
@@ -215,7 +215,7 @@ static int sync_cleancache(int level)
 	} else {
 		/* full cleanup */
 		printf(_("Cache directory: %s\n"), cachedir);
-		if(!yesno(0, _("Do you want to remove ALL packages from cache?"))) {
+		if(!noyes(_("Do you want to remove ALL packages from cache?"))) {
 			return(0);
 		}
 		printf(_("removing all packages from cache... "));
@@ -286,7 +286,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets)
 			ret = alpm_db_search(db, targets);
 			freelist = 1;
 		} else {
-			ret = alpm_db_getpkgcache(db);
+			ret = alpm_db_get_pkgcache(db);
 			freelist = 0;
 		}
 		if(ret == NULL) {
@@ -371,7 +371,7 @@ static int sync_group(int level, alpm_list_t *syncs, alpm_list_t *targets)
 		for(i = syncs; i; i = alpm_list_next(i)) {
 			pmdb_t *db = alpm_list_getdata(i);
 
-			for(j = alpm_db_getgrpcache(db); j; j = alpm_list_next(j)) {
+			for(j = alpm_db_get_grpcache(db); j; j = alpm_list_next(j)) {
 				pmgrp_t *grp = alpm_list_getdata(j);
 				const char *grpname = alpm_grp_get_name(grp);
 
@@ -425,7 +425,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
 					return(1);
 				}
 
-				for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) {
+				for(k = alpm_db_get_pkgcache(db); k; k = alpm_list_next(k)) {
 					pmpkg_t *pkg = alpm_list_getdata(k);
 
 					if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) {
@@ -446,7 +446,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
 				for(j = syncs; j; j = alpm_list_next(j)) {
 					pmdb_t *db = alpm_list_getdata(j);
 
-					for(k = alpm_db_getpkgcache(db); k; k = alpm_list_next(k)) {
+					for(k = alpm_db_get_pkgcache(db); k; k = alpm_list_next(k)) {
 						pmpkg_t *pkg = alpm_list_getdata(k);
 
 						if(strcmp(alpm_pkg_get_name(pkg), pkgstr) == 0) {
@@ -467,7 +467,7 @@ static int sync_info(alpm_list_t *syncs, alpm_list_t *targets)
 		for(i = syncs; i; i = alpm_list_next(i)) {
 			pmdb_t *db = alpm_list_getdata(i);
 
-			for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) {
+			for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) {
 				dump_pkg_sync(alpm_list_getdata(j), alpm_db_get_name(db));
 			}
 		}
@@ -510,7 +510,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets)
 	for(i = ls; i; i = alpm_list_next(i)) {
 		pmdb_t *db = alpm_list_getdata(i);
 
-		for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) {
+		for(j = alpm_db_get_pkgcache(db); j; j = alpm_list_next(j)) {
 			pmpkg_t *pkg = alpm_list_getdata(j);
 			if (!config->quiet) {
 				printf("%s %s %s\n", alpm_db_get_name(db), alpm_pkg_get_name(pkg),
@@ -605,14 +605,14 @@ static int sync_trans(alpm_list_t *targets)
 									(char*)alpm_pkg_get_name(k->data));
 						}
 						list_display("   ", pkgnames);
-						if(yesno(1, _(":: Install whole content?"))) {
+						if(yesno(_(":: Install whole content?"))) {
 							for(k = pkgnames; k; k = alpm_list_next(k)) {
 								targets = alpm_list_add(targets, strdup(alpm_list_getdata(k)));
 							}
 						} else {
 							for(k = pkgnames; k; k = alpm_list_next(k)) {
 								char *pkgname = alpm_list_getdata(k);
-								if(yesno(1, _(":: Install %s from group %s?"), pkgname, targ)) {
+								if(yesno(_(":: Install %s from group %s?"), pkgname, targ)) {
 									targets = alpm_list_add(targets, strdup(pkgname));
 								}
 							}
@@ -667,23 +667,32 @@ static int sync_trans(alpm_list_t *targets)
 		goto cleanup;
 	}
 
-	if(!(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) {
-		int confirm;
+	/* Step 3: actually perform the operation */
+	if(config->op_s_printuris) {
+		/* print uris */
+		alpm_list_t *i;
+		for(i = packages; i; i = alpm_list_next(i)) {
+			pmpkg_t *pkg = alpm_sync_get_pkg((pmsyncpkg_t *)alpm_list_getdata(i));
+			pmdb_t *db = alpm_pkg_get_db(pkg);
+			printf("%s/%s\n", alpm_db_get_url(db), alpm_pkg_get_filename(pkg));
+		}
+		/* we are done */
+		goto cleanup;
+	}
 
-		display_synctargets(packages);
-		printf("\n");
+	display_synctargets(packages);
+	printf("\n");
 
-		if(config->op_s_downloadonly) {
-			confirm = yesno(1, _("Proceed with download?"));
-		} else {
-			confirm = yesno(1, _("Proceed with installation?"));
-		}
-		if(!confirm) {
-			goto cleanup;
-		}
-	}/* else 'print uris' requested.  We're done at this point */
+	int confirm;
+	if(config->op_s_downloadonly) {
+		confirm = yesno(_("Proceed with download?"));
+	} else {
+		confirm = yesno(_("Proceed with installation?"));
+	}
+	if(!confirm) {
+		goto cleanup;
+	}
 
-	/* Step 3: actually perform the installation */
 	if(alpm_trans_commit(&data) == -1) {
 		pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"),
 		        alpm_strerrorlast());
@@ -740,7 +749,7 @@ int pacman_sync(alpm_list_t *targets)
 	alpm_list_t *sync_dbs = NULL;
 
 	/* Display only errors with -Sp and -Sw operations */
-	if(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS)) {
+	if((config->flags & PM_TRANS_FLAG_DOWNLOADONLY) || config->op_s_printuris) {
 		config->logmask &= ~PM_LOG_WARNING;
 	}
 
@@ -812,13 +821,13 @@ int pacman_sync(alpm_list_t *targets)
 	}
 
 	alpm_list_t *targs = alpm_list_strdup(targets);
-	if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) {
+	if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY) && !config->op_s_printuris) {
 		/* check for newer versions of packages to be upgraded first */
 		alpm_list_t *packages = syncfirst();
 		if(packages) {
 			printf(_(":: The following packages should be upgraded first :\n"));
 			list_display("   ", packages);
-			if(yesno(1, _(":: Do you want to cancel the current operation\n"
+			if(yesno(_(":: Do you want to cancel the current operation\n"
 							":: and upgrade these packages now?"))) {
 				FREELIST(targs);
 				targs = packages;
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 8cfa675a..b80b09ad 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -610,6 +610,25 @@ void display_synctargets(const alpm_list_t *syncpkgs)
 	alpm_list_free(rpkglist);
 }
 
+/* Helper function for comparing strings using the
+ * alpm "compare func" signature */
+int str_cmp(const void *s1, const void *s2)
+{
+	return(strcmp(s1, s2));
+}
+
+void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg)
+{
+	alpm_list_t *old = alpm_pkg_get_optdepends(oldpkg);
+	alpm_list_t *new = alpm_pkg_get_optdepends(newpkg);
+	alpm_list_t *optdeps = alpm_list_diff(new,old,str_cmp);
+	if(optdeps) {
+		printf(_("New optional dependencies for %s\n"), alpm_pkg_get_name(newpkg));
+		list_display_linebreak("   ", optdeps);
+	}
+	alpm_list_free(optdeps);
+}
+
 void display_optdepends(pmpkg_t *pkg)
 {
 	alpm_list_t *optdeps = alpm_pkg_get_optdepends(pkg);
@@ -620,10 +639,9 @@ void display_optdepends(pmpkg_t *pkg)
 }
 
 /* presents a prompt and gets a Y/N answer */
-int yesno(short preset, char *fmt, ...)
+static int question(short preset, char *fmt, va_list args)
 {
 	char response[32];
-	va_list args;
 	FILE *stream;
 
 	if(config->noconfirm) {
@@ -633,9 +651,7 @@ int yesno(short preset, char *fmt, ...)
 		stream = stderr;
 	}
 
-	va_start(args, fmt);
 	vfprintf(stream, fmt, args);
-	va_end(args);
 
 	if(preset) {
 		fprintf(stream, " %s ", _("[Y/n]"));
@@ -663,6 +679,30 @@ int yesno(short preset, char *fmt, ...)
 	return(0);
 }
 
+int yesno(char *fmt, ...)
+{
+	int ret;
+	va_list args;
+
+	va_start(args, fmt);
+	ret = question(1, fmt, args);
+	va_end(args);
+
+	return(ret);
+}
+
+int noyes(char *fmt, ...)
+{
+	int ret;
+	va_list args;
+
+	va_start(args, fmt);
+	ret = question(0, fmt, args);
+	va_end(args);
+
+	return(ret);
+}
+
 int pm_printf(pmloglevel_t level, const char *format, ...)
 {
 	int ret;
diff --git a/src/pacman/util.h b/src/pacman/util.h
index 5eeec8d2..64168587 100644
--- a/src/pacman/util.h
+++ b/src/pacman/util.h
@@ -54,8 +54,10 @@ void list_display(const char *title, const alpm_list_t *list);
 void list_display_linebreak(const char *title, const alpm_list_t *list);
 void display_targets(const alpm_list_t *pkgs, int install);
 void display_synctargets(const alpm_list_t *syncpkgs);
+void display_new_optdepends(pmpkg_t *oldpkg, pmpkg_t *newpkg);
 void display_optdepends(pmpkg_t *pkg);
-int yesno(short preset, char *fmt, ...);
+int yesno(char *fmt, ...);
+int noyes(char *fmt, ...);
 int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3)));
 int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4)));
 int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0)));
diff --git a/src/util/testdb.c b/src/util/testdb.c
index 87bfcf96..8a66819f 100644
--- a/src/util/testdb.c
+++ b/src/util/testdb.c
@@ -56,7 +56,7 @@ void output_cb(pmloglevel_t level, char *fmt, va_list args)
 	}
 }
 
-static int db_test(char *dbpath)
+static int db_test(char *dbpath, int local)
 {
 	struct dirent *ent;
 	char path[PATH_MAX];
@@ -70,7 +70,8 @@ static int db_test(char *dbpath)
 	}
 
 	while ((ent = readdir(dir)) != NULL) {
-		if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) {
+		if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")
+				|| ent->d_name[0] == '.') {
 			continue;
 		}
 		/* check for desc, depends, and files */
@@ -84,36 +85,133 @@ static int db_test(char *dbpath)
 			printf("%s: dependency file is missing\n", ent->d_name);
 			ret++;
 		}
-		snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name);
-		if(access(path, F_OK)) {
-			printf("%s: file list is missing\n", ent->d_name);
-			ret++;
+		if(local) {
+			snprintf(path, PATH_MAX, "%s/%s/files", dbpath, ent->d_name);
+			if(access(path, F_OK)) {
+				printf("%s: file list is missing\n", ent->d_name);
+				ret++;
+			}
 		}
 	}
 	return(ret);
 }
 
-int main(int argc, char **argv)
+int checkdeps(alpm_list_t *pkglist)
 {
-	int retval = 0; /* default = false */
-	pmdb_t *db = NULL;
-	char *dbpath;
-	char localdbpath[PATH_MAX];
-	alpm_list_t *i;
+	alpm_list_t *data, *i;
+	int ret = 0;
+	/* check dependencies */
+	data = alpm_checkdeps(pkglist, 0, NULL, pkglist);
+	for(i = data; i; i = alpm_list_next(i)) {
+		pmdepmissing_t *miss = alpm_list_getdata(i);
+		pmdepend_t *dep = alpm_miss_get_dep(miss);
+		char *depstring = alpm_dep_get_string(dep);
+		printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss),
+				depstring);
+		free(depstring);
+		ret++;
+	}
+	return(ret);
+}
 
-	if(argc == 1) {
-		dbpath = DBPATH;
-	} else if(argc == 3 && strcmp(argv[1], "-b") == 0) {
-		dbpath = argv[2];
-	} else {
-		fprintf(stderr, "usage: %s -b <pacman db>\n", BASENAME);
-		return(1);
+int checkconflicts(alpm_list_t *pkglist)
+{
+	alpm_list_t *data, *i;
+	int ret = 0;
+	/* check conflicts */
+	data = alpm_checkconflicts(pkglist);
+	for(i = data; i; i = i->next) {
+		pmconflict_t *conflict = alpm_list_getdata(i);
+		printf("%s conflicts with %s\n", alpm_conflict_get_package1(conflict),
+				alpm_conflict_get_package2(conflict));
+		ret++;
 	}
+	return(ret);
+}
+
+int check_localdb(char *dbpath) {
+	char localdbpath[PATH_MAX];
+	int ret = 0;
+	pmdb_t *db = NULL;
+	alpm_list_t *pkglist;
 
 	snprintf(localdbpath, PATH_MAX, "%s/local", dbpath);
-	retval = db_test(localdbpath);
-	if(retval) {
-		return(retval);
+	ret = db_test(localdbpath, 1);
+	if(ret) {
+		return(ret);
+	}
+
+	db = alpm_db_register_local();
+	if(db == NULL) {
+		fprintf(stderr, "error: could not register 'local' database (%s)\n",
+				alpm_strerrorlast());
+		cleanup(EXIT_FAILURE);
+	}
+	pkglist = alpm_db_get_pkgcache(db);
+	ret += checkdeps(pkglist);
+	ret += checkconflicts(pkglist);
+	return(ret);
+}
+
+int check_syncdbs(char *dbpath, alpm_list_t *dbnames) {
+	char syncdbpath[PATH_MAX];
+	int ret = 0;
+	pmdb_t *db = NULL;
+	alpm_list_t *i, *pkglist, *syncpkglist = NULL;
+
+	for(i = dbnames; i; i = alpm_list_next(i)) {
+		char *dbname = alpm_list_getdata(i);
+		snprintf(syncdbpath, PATH_MAX, "%s/sync/%s", dbpath, dbname);
+		ret = db_test(syncdbpath, 0);
+		if(ret) {
+			return(ret);
+		}
+		db = alpm_db_register_sync(dbname);
+		if(db == NULL) {
+			fprintf(stderr, "error: could not register sync database (%s)\n",
+					alpm_strerrorlast());
+			cleanup(EXIT_FAILURE);
+		}
+		pkglist = alpm_db_get_pkgcache(db);
+		syncpkglist = alpm_list_join(syncpkglist, alpm_list_copy(pkglist));
+	}
+	ret += checkdeps(syncpkglist);
+	alpm_list_free(syncpkglist);
+
+	alpm_db_unregister_all();
+	return(ret);
+}
+
+void usage() {
+	fprintf(stderr, "usage:\n");
+  fprintf(stderr,
+			"\t%s [-b <pacman db>]                : check the local database\n", BASENAME);
+  fprintf(stderr,
+			"\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME);
+	exit(1);
+}
+
+int main(int argc, char **argv)
+{
+	int ret = 0;
+	char *dbpath = DBPATH;
+	int a = 1;
+	alpm_list_t *dbnames = NULL;
+
+	while(a < argc) {
+		if(strcmp(argv[a], "-b") == 0) {
+			if(++a < argc) {
+				dbpath = argv[a];
+			} else {
+				usage();
+			}
+		}	else if(strcmp(argv[a], "-h") == 0 ||
+				strcmp(argv[a], "--help") == 0 ) {
+			usage();
+		} else {
+			dbnames = alpm_list_add(dbnames, argv[a]);
+		}
+		a++;
 	}
 
 	if(alpm_initialize() == -1) {
@@ -126,34 +224,15 @@ int main(int argc, char **argv)
 
 	alpm_option_set_dbpath(dbpath);
 
-	db = alpm_db_register_local();
-	if(db == NULL) {
-		fprintf(stderr, "error: could not register 'local' database (%s)\n",
-				alpm_strerrorlast());
-		cleanup(EXIT_FAILURE);
-	}
-
-	/* check dependencies */
-	alpm_list_t *data;
-	data = alpm_checkdeps(db, 0, NULL, alpm_db_getpkgcache(db));
-	for(i = data; i; i = alpm_list_next(i)) {
-		pmdepmissing_t *miss = alpm_list_getdata(i);
-		pmdepend_t *dep = alpm_miss_get_dep(miss);
-		char *depstring = alpm_dep_get_string(dep);
-		printf("missing dependency for %s : %s\n", alpm_miss_get_target(miss),
-				depstring);
-		free(depstring);
-	}
-
-	/* check conflicts */
-	data = alpm_checkdbconflicts(db);
-	for(i = data; i; i = i->next) {
-		pmconflict_t *conflict = alpm_list_getdata(i);
-		printf("%s conflicts with %s\n", alpm_conflict_get_package1(conflict),
-				alpm_conflict_get_package2(conflict));
+	if(!dbnames) {
+		printf("Checking the integrity of the local database in %s\n",dbpath);
+		ret = check_localdb(dbpath);
+	} else {
+		printf("Checking the integrity of the sync databases in %s\n",dbpath);
+		ret = check_syncdbs(dbpath,dbnames);
 	}
 
-	cleanup(retval);
+	cleanup(ret);
 }
 
 /* vim: set ts=2 sw=2 noet: */