--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,8 @@ def runcmd(cmd, env):
     # trust warnings since the .hg/hgrc file is untrusted. That is
     # fine, we don't want to load it anyway.
     err = [e for e in err.splitlines()
-           if not e.startswith('Not trusting file')]
+           if not (e.startswith('Not trusting file')
+                   or e.startswith('obsolete feature not enabled'))]
     if err:
         return ''
     return out
@@ -118,7 +119,8 @@ setup(
     long_description=open(os.path.join(os.path.dirname(__file__),
                                          'README')).read(),
     keywords='mercurial',
-    packages=('hgsubversion', 'hgsubversion.hooks', 'hgsubversion.svnwrap'),
+    packages=('hgsubversion', 'hgsubversion.hooks', 'hgsubversion.layouts',
+              'hgsubversion.svnwrap'),
     package_data={ 'hgsubversion': ['help/subversion.rst'] },
     platforms='any',
     install_requires=requires,