diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index ef26443..4b2d2ef 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -362,12 +362,6 @@
         // update BND instructions to add included Maven resources
         includeMavenResources( currentProject, properties, getLog() );
 
-        if ( null != classifier && classifier.trim().length() > 0 )
-        {
-            String bundleVersion = properties.getProperty( Analyzer.BUNDLE_VERSION );
-            properties.put( Analyzer.BUNDLE_VERSION, bundleVersion + '-' + classifier );
-        }
-
         if ( !properties.containsKey( Analyzer.EXPORT_PACKAGE ) && !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) )
         {
             String bsn = properties.getProperty( Analyzer.BUNDLE_SYMBOLICNAME );
@@ -821,6 +815,8 @@
         properties.put( "project.build.directory", getBuildDirectory() );
         properties.put( "project.build.outputdirectory", getOutputDirectory() );
 
+        properties.put( "classifier", classifier == null ? "" : classifier );
+
         return properties;
     }