diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
index 4879ba8..093c6df 100644
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
+++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
@@ -413,10 +413,8 @@
                     {
                         R4Attribute attribute = pkgs[pkgIdx].getAttributes()[i];
                         String key = attribute.getName();
-                        if (key.equalsIgnoreCase("specification-version")
-                                || key.equalsIgnoreCase("version"))
-                            continue;
-                        else
+                        if (!key.equalsIgnoreCase("specification-version")
+                            && !key.equalsIgnoreCase("version"))
                         {
                             Object value = attribute.getValue();
                             cap.addP(key, value);
@@ -425,7 +423,7 @@
                     for (int i = 0; i < pkgs[pkgIdx].getDirectives().length; i++)
                     {
                         R4Directive directive = pkgs[pkgIdx].getDirectives()[i];
-                        String key = directive.getName();
+                        String key = directive.getName() + ":";
                         Object value = directive.getValue();
                         cap.addP(key, value);
                     }