diff --git a/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Export.java b/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Export.java
index 281871a62a..07e458dc13 100644
--- a/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Export.java
+++ b/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Export.java
@@ -81,19 +81,21 @@
 	 * If not specified, the {@link Substitution#CALCULATED} substitution
 	 * policy is used for this package.
 	 */
-	Substitution substitution() default Substitution.CALCULATED;
+	String substitution() default Substitution.CALCULATED;
 
 	/**
 	 * Substitution policy for this package.
 	 */
-	public enum Substitution {
+	public final class Substitution {
+		private Substitution() {
+		}
 		/**
 		 * Use a consumer type version range for the import package clause when
 		 * substitutably importing a package.
 		 * 
 		 * @see ConsumerType
 		 */
-		CONSUMER,
+		public static final String	CONSUMER	= "CONSUMER";
 
 		/**
 		 * Use a provider type version range for the import package clause when
@@ -101,17 +103,17 @@ public enum Substitution {
 		 * 
 		 * @see ProviderType
 		 */
-		PROVIDER,
+		public static final String	PROVIDER	= "PROVIDER";
 
 		/**
 		 * The package must not be substitutably imported.
 		 */
-		NOIMPORT,
+		public static final String	NOIMPORT	= "NOIMPORT";
 
 		/**
 		 * The policy value is calculated by inspection of the classes in the
 		 * package.
 		 */
-		CALCULATED
+		public static final String	CALCULATED	= "CALCULATED";
 	}
 }
diff --git a/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Requirement.java b/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Requirement.java
index 5ce4279b29..8acf269bcf 100644
--- a/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Requirement.java
+++ b/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/Requirement.java
@@ -119,32 +119,23 @@
 	 * If not specified, the {@code cardinality} directive is omitted from the
 	 * requirement clause.
 	 */
-	Cardinality cardinality() default Cardinality.SINGLE;
+	String cardinality() default Cardinality.SINGLE;
 
 	/**
 	 * Cardinality for this requirement.
 	 */
-	public enum Cardinality {
+	public final class Cardinality {
+		private Cardinality() {
+		}
 		/**
 		 * Indicates if the requirement can only be wired a single time.
 		 */
-		SINGLE("single"), // Namespace.CARDINALITY_SINGLE
+		public static final String	SINGLE		= "SINGLE";		// Namespace.CARDINALITY_SINGLE
 
 		/**
 		 * Indicates if the requirement can be wired multiple times.
 		 */
-		MULTIPLE("multiple"); // Namespace.CARDINALITY_MULTIPLE
-
-		private final String value;
-
-		Cardinality(String value) {
-			this.value = value;
-		}
-
-		@Override
-		public String toString() {
-			return value;
-		}
+		public static final String	MULTIPLE	= "MULTIPLE";	// Namespace.CARDINALITY_MULTIPLE
 	}
 
 	/**
@@ -157,33 +148,24 @@ public String toString() {
 	 * If not specified, the {@code resolution} directive is omitted from the
 	 * requirement clause.
 	 */
-	Resolution resolution() default Resolution.MANDATORY;
+	String resolution() default Resolution.MANDATORY;
 
 	/**
 	 * Resolution for this requirement.
 	 */
-	public enum Resolution {
+	public final class Resolution {
+		private Resolution() {
+		}
 		/**
 		 * A mandatory requirement forbids the bundle to resolve when the
 		 * requirement is not satisfied.
 		 */
-		MANDATORY("mandatory"), // Namespace.RESOLUTION_MANDATORY
+		public static final String	MANDATORY	= "MANDATORY";	// Namespace.RESOLUTION_MANDATORY
 
 		/**
 		 * An optional requirement allows a bundle to resolve even if the
 		 * requirement is not satisfied.
 		 */
-		OPTIONAL("optional"); // Namespace.RESOLUTION_OPTIONAL
-
-		private final String value;
-
-		Resolution(String value) {
-			this.value = value;
-		}
-
-		@Override
-		public String toString() {
-			return value;
-		}
+		public static final String	OPTIONAL	= "OPTIONAL";	// Namespace.RESOLUTION_OPTIONAL
 	}
 }
diff --git a/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/package-info.java b/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/package-info.java
index 12d53d4428..5026b2f66e 100644
--- a/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/package-info.java
+++ b/org.osgi.annotation.bundle/src/org/osgi/annotation/bundle/package-info.java
@@ -17,13 +17,13 @@
  *******************************************************************************/
 
 /**
- * OSGi Bundle Annotations Package Version 1.1.
+ * OSGi Bundle Annotations Package Version 2.0.
  * <p>
  * This package is not used at runtime.
  *
  * @author $Id$
  */
-@Version("1.1.1")
+@Version("2.0")
 package org.osgi.annotation.bundle;
 
 import org.osgi.annotation.versioning.Version;