diff -Naur pactest-0.2.orig/pmdb.py pactest-0.2/pmdb.py
--- pactest-0.2.orig/pmdb.py	2006-02-17 22:57:41.000000000 +0100
+++ pactest-0.2/pmdb.py	2006-02-20 00:39:07.000000000 +0100
@@ -215,7 +215,7 @@
 		"""
 		"""
 
-		path = os.path.join(self.dbdir, self.treename, pkg.fullname())
+		path = os.path.join(self.dbdir, self.treename, pkg.dbname())
 		if not os.path.isdir(path):
 			os.makedirs(path);
 
@@ -231,13 +231,13 @@
 			data.append(_mksection("DESC", pkg.desc))
 		if pkg.groups:
 			data.append(_mksection("GROUPS", pkg.groups))
+		if pkg.arch:
+			data.append(_mksection("ARCH", pkg.arch))
 		if self.treename == "local":
 			if pkg.url:
 				data.append(_mksection("URL", pkg.url))
 			if pkg.license:
 				data.append(_mksection("LICENSE", pkg.license))
-			if pkg.arch:
-				data.append(_mksection("ARCH", pkg.arch))
 			if pkg.builddate:
 				data.append(_mksection("BUILDDATE", pkg.builddate))
 			if pkg.installdate:
diff -Naur pactest-0.2.orig/pmpkg.py pactest-0.2/pmpkg.py
--- pactest-0.2.orig/pmpkg.py	2006-02-17 22:57:26.000000000 +0100
+++ pactest-0.2/pmpkg.py	2006-02-20 00:39:09.000000000 +0100
@@ -32,7 +32,7 @@
 	Object holding data from an ArchLinux package.
 	"""
 
-	def __init__(self, name, version = "1.0-1"):
+	def __init__(self, name, version = "1.0-1", arch = 'i686'):
 		# desc
 		self.name = name
 		self.version = version
@@ -40,7 +40,7 @@
 		self.groups = []
 		self.url = ""
 		self.license = []
-		self.arch = ""
+		self.arch = arch
 		self.builddate = ""
 		self.installdate = ""
 		self.packager = ""
@@ -86,12 +86,19 @@
 		s.append("files: %s" % " ".join(self.files))
 		return "\n".join(s)
 
+	def dbname(self):
+		"""Db name of a package.
+		
+		Returns a string formatted as follows: "pkgname-pkgver".
+		"""
+		return self.name + "-" + self.version
+
 	def fullname(self):
 		"""Long name of a package.
 		
-		Returns a string formatted as follows: "pkgname-pkgver".
+		Returns a string formatted as follows: "pkgname-pkgver-arch".
 		"""
-		return "%s-%s" % (self.name, self.version)
+		return self.name + "-" + self.version + "-" + self.arch
 
 	def filename(self):
 		"""File name of a package, including its extension.
diff -Naur pactest-0.2.orig/util.py pactest-0.2/util.py
--- pactest-0.2.orig/util.py	2006-02-14 19:15:26.000000000 +0100
+++ pactest-0.2/util.py	2006-02-20 00:39:10.000000000 +0100
@@ -28,8 +28,8 @@
 PM_ROOT     = "/"
 PM_DBPATH   = "var/lib/pacman"
 PM_CACHEDIR = "var/cache/pacman/pkg"
-PM_EXT_PKG  = ".pkg.tar.gz"
-PM_EXT_DB   = ".db.tar.gz"
+PM_EXT_PKG  = ".fpm"
+PM_EXT_DB   = ".fdb"
 PM_PACNEW   = ".pacnew"
 PM_PACORIG  = ".pacorig"
 PM_PACSAVE  = ".pacsave"