diff --git a/hpy/devel/__init__.py b/hpy/devel/__init__.py
index dc7458096..315544a3f 100644
--- a/hpy/devel/__init__.py
+++ b/hpy/devel/__init__.py
@@ -329,7 +329,7 @@ def _finalize_hpy_ext(self, ext):
         if static_libs:
             static_libs = self.hpydevel.get_static_libs(ext.hpy_abi)
             if static_libs is None or len(static_libs) != 1:
-                raise DistutilsError('Expected exactly one static library for'
+                raise DistutilsError('Expected exactly one static library for '
                                      'ABI "%s" but got: %r' %
                                      (ext.hpy_abi, static_libs))
 
diff --git a/setup.py b/setup.py
index 4cd6c76e6..dccac204d 100644
--- a/setup.py
+++ b/setup.py
@@ -120,7 +120,8 @@ def get_scm_config():
     'hpy/trace/src/include',
 ]
 
-HPY_EXTRA_LIB_NAME = "hpy-extra-universal"
+HPY_EXTRA_UNIVERSAL_LIB_NAME = "hpy-extra-universal"
+HPY_EXTRA_HYBRID_LIB_NAME = "hpy-extra-hybrid"
 HPY_CTX_LIB_NAME = "hpy-ctx-cpython"
 
 HPY_BUILD_CLIB_ABI_ATTR = "hpy_abi"
@@ -183,9 +184,13 @@ def build_libraries(self, libraries):
                 self.build_clib = orig_build_clib
 
 
-STATIC_LIBS = [(HPY_EXTRA_LIB_NAME,
+STATIC_LIBS = [(HPY_EXTRA_UNIVERSAL_LIB_NAME,
                 {'sources': HPY_EXTRA_SOURCES,
                  HPY_BUILD_CLIB_ABI_ATTR: 'universal',
+                 'macros': [('HPY_ABI_UNIVERSAL', None)]}),
+               (HPY_EXTRA_HYBRID_LIB_NAME,
+                {'sources': HPY_EXTRA_SOURCES,
+                 HPY_BUILD_CLIB_ABI_ATTR: 'hybrid',
                  'macros': [('HPY_ABI_HYBRID', None)]}),
                (HPY_CTX_LIB_NAME,
                 {'sources': HPY_EXTRA_SOURCES + HPY_CTX_SOURCES,