diff --git a/HaikuPorter/Port.py b/HaikuPorter/Port.py
index 9b08f0e9..ced7fd59 100644
--- a/HaikuPorter/Port.py
+++ b/HaikuPorter/Port.py
@@ -712,13 +712,13 @@ def extractPatchset(self):
 		for s, source in enumerate(self.sources, 1):
 			if s == 1:
 				patchSetFileName = self.baseName + '-' + self.version + '.patchset'
-				archPatchSetFileName = (self.baseName + '-' + self.version + '-'
+				archPatchSetFileName = (self.name + '-' + self.version + '-'
 										+ self.targetArchitecture
 										+ '.patchset')
 			else:
 				patchSetFileName = (self.baseName + '-' + self.version + '-source'
 									+ str(s) + '.patchset')
-				archPatchSetFileName = (self.baseName + '-' + self.version + '-'
+				archPatchSetFileName = (self.name + '-' + self.version + '-'
 										+ self.targetArchitecture + '-source'
 										+ str(s) + '.patchset')
 			patchSetFilePath = self.patchesDir + '/' + patchSetFileName