diff --git a/bin/dunepackaging.py b/bin/dunepackaging.py
index e4a5da6c8858c74a420c2df391f500d456949a49..db9af2050b3075c9776f55ebf8debd6e74fbfcb7 100755
--- a/bin/dunepackaging.py
+++ b/bin/dunepackaging.py
@@ -22,7 +22,7 @@ def main(argv):
 
     repositories = ["gitlab", "testpypi", "pypi"]
     def usage():
-        return 'usage: dunepackaging.py [--upload <'+"|".join(repositories)+'> | -c | --clean | --version 1.0.DATE> | --onlysdist]'
+        return 'usage: dunepackaging.py [--upload <'+"|".join(repositories)+'> | -c | --clean | --version <version> | --onlysdist]'
 
     try:
         opts, args = getopt.getopt(argv, "hc", ["upload=", "clean", "version=", "onlysdist"])
diff --git a/python/dune/packagemetadata.py b/python/dune/packagemetadata.py
index f18637de100cbafc20b381126914fa852cd27a7b..28e8d8a9c9b230ee0b07107ecf4eb59044bb8677 100755
--- a/python/dune/packagemetadata.py
+++ b/python/dune/packagemetadata.py
@@ -227,7 +227,7 @@ class Data:
                 major = self.version.split('-')[0]
                 self.version = Version(major).__str__() + '.dev' + date.today().strftime('%Y%m%d')
             self.depends = [(dep[0], '(<= '+self.version+')') for dep in self.depends]
-            self.suggests = [(dep[0], '(<= '+self.version+')') for dep in self.suggests]
+            self.python_requires = [((pr[0], '(<= '+self.version+')') if pr[0].startswith('dune-') else pr) for pr in self.python_requires]
 
     def asPythonRequirementString(self, requirements):
         return [(r[0]+str(r[1])).replace("("," ").replace(")","").replace(" ","") for r in requirements]
@@ -236,11 +236,9 @@ def cmakeFlags():
     # defaults
     flags = dict([
         ('CMAKE_BUILD_TYPE','Release'),
-        ('BUILD_SHARED_LIBS','TRUE'),
+        ('CMAKE_INSTALL_RPATH_USE_LINK_PATH','TRUE'),
         ('DUNE_ENABLE_PYTHONBINDINGS','TRUE'),
         ('DUNE_PYTHON_INSTALL_LOCATION','none'),
-        ('CMAKE_INSTALL_RPATH_USE_LINK_PATH','TRUE'),
-        ('CMAKE_INSTALL_RPATH',"'$ORIGIN/../../../..'"),
         ('ALLOW_CXXFLAGS_OVERWRITE','ON'),
         ('CMAKE_DISABLE_FIND_PACKAGE_LATEX','TRUE'),
         ('CMAKE_DISABLE_FIND_PACKAGE_Doxygen','TRUE'),