diff --git a/logback-access/pom.xml b/logback-access/pom.xml
index ea5f1f5d17..79ef668627 100755
--- a/logback-access/pom.xml
+++ b/logback-access/pom.xml
@@ -145,7 +145,7 @@
                 Bnd's analysis of java code.
             -->
             <Import-Package>
-              ch.qos.logback.access*;version="${range;[==,+);${maven_version;${project.version}}}",
+              ch.qos.logback.access*;version="${range;[==,+);${version_cleanup;${project.version}}}",
               ch.qos.logback.core.rolling,
               ch.qos.logback.core.rolling.helper,
               org.apache.catalina.*;version="${tomcat.version}";resolution:=optional,
diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml
index 5ed3f58d49..d081e62525 100755
--- a/logback-classic/pom.xml
+++ b/logback-classic/pom.xml
@@ -320,7 +320,7 @@
                  config files). They won't be found by Bnd's analysis
                  of java code. -->
             <Import-Package>
-              ch.qos.logback.classic*;version="${range;[==,+);${maven_version;${project.version}}}",
+              ch.qos.logback.classic*;version="${range;[==,+);${version_cleanup;${project.version}}}",
               sun.reflect;resolution:=optional,
               javax.*;resolution:=optional,
               org.xml.*;resolution:=optional,
diff --git a/logback-core/pom.xml b/logback-core/pom.xml
index d78f4d4bb3..7d1cb38980 100755
--- a/logback-core/pom.xml
+++ b/logback-core/pom.xml
@@ -142,7 +142,7 @@
           <instructions>
             <Export-Package>ch.qos.logback.core*</Export-Package>
             <Import-Package>
-              ch.qos.logback.core*;version="${range;[==,+);${maven_version;${project.version}}}",
+              ch.qos.logback.core*;version="${range;[==,+);${version_cleanup;${project.version}}}",
               javax.*;resolution:=optional,
               org.xml.*;resolution:=optional,
               org.fusesource.jansi;resolution:=optional,