diff --git a/debian/bin/abicheck.py b/debian/bin/abicheck.py
index 1503805df..d5b6a40d7 100755
--- a/debian/bin/abicheck.py
+++ b/debian/bin/abicheck.py
@@ -9,10 +9,7 @@ class checker(object):
         self.config = ConfigReaderCore(["debian/config"])
         self.filename_new = "%s/Module.symvers" % dir
         abiname = self.config['abi',]['abiname']
-        if featureset == 'none':
-            self.filename_ref = "debian/config/%s/abi-%s.%s" % (arch, abiname, flavour)
-        else:
-            self.filename_ref = "debian/config/%s/%s/abi-%s.%s" % (arch, featureset, abiname, flavour)
+        self.filename_ref = "debian/abi/%s/%s_%s_%s" % (abiname, arch, featureset, flavour)
 
     def __call__(self, out):
         ret = 0
diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index d0eebcd4c..fc978fa2a 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -107,10 +107,10 @@ class main(object):
         return filename_out
 
     def save_abi(self, symbols, arch, featureset, flavour):
-        out = "debian/config/%s" % arch
-        if featureset != 'none':
-            out += "/%s" % featureset
-        out += "/abi-%s.%s" % (self.abiname, flavour)
+        dir = "debian/abi/%s" % self.abiname
+        if not os.path.exists(dir):
+            os.makedirs(dir)
+        out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)
         symbols.write(file(out, 'w'))
 
     def update_arch(self, config, arch):