diff --git a/lib/pluginmanager/prepare_offline_pack.rb b/lib/pluginmanager/prepare_offline_pack.rb
index 0860c3b602b..45197b2b3c6 100644
--- a/lib/pluginmanager/prepare_offline_pack.rb
+++ b/lib/pluginmanager/prepare_offline_pack.rb
@@ -60,7 +60,7 @@ def validate_arguments!
 
 Examples:
 bin/logstash-plugin prepare-offline-pack logstash-input-beats
-bin/logstash-plugin prepare-offline-pack logstash-filter-jdbc logstash-input-beats
+bin/logstash-plugin prepare-offline-pack logstash-filter-kv logstash-input-beats
 bin/logstash-plugin prepare-offline-pack logstash-filter-*
 bin/logstash-plugin prepare-offline-pack logstash-filter-* logstash-input-beats
 
diff --git a/qa/integration/specs/cli/prepare_offline_pack_spec.rb b/qa/integration/specs/cli/prepare_offline_pack_spec.rb
index babdb039371..e691903a6c9 100644
--- a/qa/integration/specs/cli/prepare_offline_pack_spec.rb
+++ b/qa/integration/specs/cli/prepare_offline_pack_spec.rb
@@ -35,6 +35,26 @@
     end
   end
 
+  context "creating a pack for integration plugins" do
+    let(:plugin_to_pack) { "logstash-integration-jdbc" }
+
+
+    it "successfully create a pack" do
+      execute = @logstash_plugin.prepare_offline_pack(plugin_to_pack, temporary_zip_file)
+
+      expect(execute.exit_code).to eq(0)
+      expect(execute.stderr_and_stdout).to match(/Offline package created at/)
+      expect(execute.stderr_and_stdout).to match(/#{temporary_zip_file}/)
+
+      unpacked = unpack(temporary_zip_file)
+      expect(unpacked.plugins.collect(&:name)).to include(plugin_to_pack)
+      expect(unpacked.plugins.size).to eq(1)
+
+      expect(unpacked.dependencies.size).to be > 0
+    end
+  end
+
+
   context "create a pack from a wildcard" do
     let(:plugins_to_pack) { %w(logstash-filter-*) }
 
@@ -50,7 +70,7 @@
       filters = @logstash_plugin.list(plugins_to_pack.first)
                                 .stderr_and_stdout.split("\n")
                                 .delete_if do |line|
-                                  line =~ /cext|JAVA_OPT|fatal|^WARNING|Option \w+ was deprecated/
+                                  line =~ /cext|├──|└──|logstash-integration|JAVA_OPT|fatal|^WARNING|Option \w+ was deprecated/
                                 end
 
       expect(unpacked.plugins.collect(&:name)).to include(*filters)
diff --git a/rakelib/plugins-metadata.json b/rakelib/plugins-metadata.json
index 25fe9d24d18..b8daea5aa4d 100644
--- a/rakelib/plugins-metadata.json
+++ b/rakelib/plugins-metadata.json
@@ -148,12 +148,12 @@
     "skip-list": true
   },
   "logstash-filter-jdbc_static": {
-    "default-plugins": true,
-    "skip-list": false
+    "default-plugins": false,
+    "skip-list": true
   },
   "logstash-filter-jdbc_streaming": {
-    "default-plugins": true,
-    "skip-list": false
+    "default-plugins": false,
+    "skip-list": true
   },
   "logstash-filter-json": {
     "default-plugins": true,
@@ -317,8 +317,8 @@
     "skip-list": true
   },
   "logstash-input-jdbc": {
-    "default-plugins": true,
-    "skip-list": false
+    "default-plugins": false,
+    "skip-list": true
   },
   "logstash-input-jms": {
     "default-plugins": true,
@@ -402,6 +402,10 @@
     "default-plugins": true,
     "skip-list": false
   },
+  "logstash-integration-jdbc": {
+    "default-plugins": true,
+    "skip-list": false
+  },
   "logstash-integration-kafka": {
     "default-plugins": true,
     "skip-list": false