diff --git a/pisi/constants.py b/pisi/constants.py
index e044bad5..f101d93c 100644
--- a/pisi/constants.py
+++ b/pisi/constants.py
@@ -51,7 +51,7 @@ class Constants:
         self.__c.lzma_suffix = ".lzma"
 
         # suffix for auto generated debug packages
-        self.__c.debug_name_suffix = "-debug"
+        self.__c.debug_name_suffix = "-dbginfo"
         self.__c.debug_file_suffix = ".debug"
 
         # suffix for auto generated ar packages
diff --git a/pisi/operations/build.py b/pisi/operations/build.py
index 2e922cc0..3c83c052 100644
--- a/pisi/operations/build.py
+++ b/pisi/operations/build.py
@@ -600,7 +600,7 @@ class Builder:
         # FIXME: find a better way to deal with the summary and description constants.
         debug_package_obj.summary['en'] = u'Debug files for %s' % (self.spec.source.name)
         debug_package_obj.description['en'] = u'Debug files for %s' % (self.spec.source.name)
-        debug_package_obj.partOf = self.spec.source.partOf + '-debug'
+        debug_package_obj.partOf = self.spec.source.partOf + ctx.const.debug_name_suffix
         for f in debug_files:
             debug_package_obj.files.append(pisi.specfile.Path(path = f[len(self.pkg_debug_dir()):], fileType = "debug"))