diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py
index 6e16551..8866814 100644
--- a/source-builder/sb/config.py
+++ b/source-builder/sb/config.py
@@ -447,14 +447,14 @@ class file:
                     if len(ls) == 2:
                         self.defines[d] = '1'
                     else:
-                        self.defines[d] = ls[2].strip()
+                        self.defines[d] = ' '.join([f.strip() for f in ls[2:]])
                 else:
                     self._warning("macro '%s' already defined" % (d))
             else:
                 if len(ls) == 2:
                     self.defines[d] = '1'
                 else:
-                    self.defines[d] = ls[2].strip()
+                    self.defines[d] = ' '.join([f.strip() for f in ls[2:]])
 
     def _undefine(self, config, ls):
         if len(ls) <= 1:
diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py
index 02652ef..0146153 100644
--- a/source-builder/sb/setbuilder.py
+++ b/source-builder/sb/setbuilder.py
@@ -216,7 +216,9 @@ class buildset:
                     if l.startswith('%define'):
                         ls = l.split()
                         if len(ls) > 2:
-                            self.defaults[ls[1].strip()] = ('none', 'none', ls[2].strip())
+                            self.defaults[ls[1].strip()] = ('none',
+                                                            'none',
+                                                            ' '.join([f.strip() for f in ls[2:]]))
                         else:
                             self.defaults[ls[1].strip()] = ('none', 'none', '1')
                     elif l.startswith('%include'):