diff --git a/debian/changelog b/debian/changelog
index 9c44a03..7a477f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ruby-jira (2.2.0-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 14 Mar 2022 05:21:36 -0000
+
 ruby-jira (2.1.5-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/fix-securerandom-nameerror.patch b/debian/patches/fix-securerandom-nameerror.patch
index 1dd64f5..5d7d0bc 100644
--- a/debian/patches/fix-securerandom-nameerror.patch
+++ b/debian/patches/fix-securerandom-nameerror.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
  spec/jira/resource/project_spec.rb | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/spec/jira/resource/project_spec.rb b/spec/jira/resource/project_spec.rb
-index df8e102..9d90bc2 100644
---- a/spec/jira/resource/project_spec.rb
-+++ b/spec/jira/resource/project_spec.rb
+Index: ruby-jira/spec/jira/resource/project_spec.rb
+===================================================================
+--- ruby-jira.orig/spec/jira/resource/project_spec.rb
++++ ruby-jira/spec/jira/resource/project_spec.rb
 @@ -1,4 +1,5 @@
  require 'spec_helper'
 +require 'securerandom'
diff --git a/debian/patches/remove-bundler-rubygems.patch b/debian/patches/remove-bundler-rubygems.patch
index 9d0b9ce..6534abe 100644
--- a/debian/patches/remove-bundler-rubygems.patch
+++ b/debian/patches/remove-bundler-rubygems.patch
@@ -3,8 +3,10 @@ Author: Pirate Praveen <praveen@debian.org>
 Last-Update: 2017-11-02
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
+Index: ruby-jira/spec/spec_helper.rb
+===================================================================
+--- ruby-jira.orig/spec/spec_helper.rb
++++ ruby-jira/spec/spec_helper.rb
 @@ -1,6 +1,4 @@
  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 -require 'rubygems'
@@ -12,8 +14,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  require 'webmock/rspec'
  require 'pry'
  
---- a/Rakefile
-+++ b/Rakefile
+Index: ruby-jira/Rakefile
+===================================================================
+--- ruby-jira.orig/Rakefile
++++ ruby-jira/Rakefile
 @@ -1,6 +1,3 @@
 -require 'bundler/gem_tasks'
 -
diff --git a/example.rb b/example.rb
index 5e92b80..f332c74 100644
--- a/example.rb
+++ b/example.rb
@@ -166,6 +166,14 @@ client.Issue.jql(a_normal_jql_search, max_results: 500)
 # # --------------------------
 # issue.comments.first.save({"body" => "an updated comment frome example.rb"})
 
+
+# # Add attachment to Issue
+# # ------------------------
+#  issue = client.Issue.find('PROJ-1')
+#  attachment = issue.attachments.build
+#  attachment.save('file': '/path/to/file')
+#
+
 # List all available link types
 # ------------------------------
 pp client.Issuelinktype.all
diff --git a/lib/jira-ruby.rb b/lib/jira-ruby.rb
index b4250cf..5036e9e 100644
--- a/lib/jira-ruby.rb
+++ b/lib/jira-ruby.rb
@@ -1,5 +1,6 @@
 $LOAD_PATH << __dir__
 
+require 'active_support'
 require 'active_support/inflector'
 ActiveSupport::Inflector.inflections do |inflector|
   inflector.singular /status$/, 'status'
@@ -25,6 +26,9 @@ require 'jira/resource/worklog'
 require 'jira/resource/applinks'
 require 'jira/resource/issuelinktype'
 require 'jira/resource/issuelink'
+require 'jira/resource/suggested_issue'
+require 'jira/resource/issue_picker_suggestions_issue'
+require 'jira/resource/issue_picker_suggestions'
 require 'jira/resource/remotelink'
 require 'jira/resource/sprint'
 require 'jira/resource/sprint_report'
diff --git a/lib/jira/client.rb b/lib/jira/client.rb
index 522e8d8..8ac91b3 100644
--- a/lib/jira/client.rb
+++ b/lib/jira/client.rb
@@ -257,6 +257,10 @@ module JIRA
       JIRA::Resource::IssuelinktypeFactory.new(self)
     end
 
+    def IssuePickerSuggestions
+      JIRA::Resource::IssuePickerSuggestionsFactory.new(self)
+    end
+
     def Remotelink
       JIRA::Resource::RemotelinkFactory.new(self)
     end
diff --git a/lib/jira/resource/issue_picker_suggestions.rb b/lib/jira/resource/issue_picker_suggestions.rb
new file mode 100644
index 0000000..2834c16
--- /dev/null
+++ b/lib/jira/resource/issue_picker_suggestions.rb
@@ -0,0 +1,24 @@
+module JIRA
+  module Resource
+    class IssuePickerSuggestionsFactory < JIRA::BaseFactory # :nodoc:
+    end
+
+    class IssuePickerSuggestions < JIRA::Base
+      has_many :sections, class: JIRA::Resource::IssuePickerSuggestionsIssue
+
+      def self.all(client, query = '', options = { current_jql: nil, current_issue_key: nil, current_project_id: nil, show_sub_tasks: nil, show_sub_tasks_parent: nil })
+        url = client.options[:rest_base_path] + "/issue/picker?query=#{CGI.escape(query)}"
+
+        url << "&currentJQL=#{CGI.escape(options[:current_jql])}" if options[:current_jql]
+        url << "&currentIssueKey=#{CGI.escape(options[:current_issue_key])}" if options[:current_issue_key]
+        url << "&currentProjectId=#{CGI.escape(options[:current_project_id])}" if options[:current_project_id]
+        url << "&showSubTasks=#{options[:show_sub_tasks]}" if options[:show_sub_tasks]
+        url << "&showSubTaskParent=#{options[:show_sub_task_parent]}" if options[:show_sub_task_parent]
+
+        response = client.get(url)
+        json = parse_json(response.body)
+        client.IssuePickerSuggestions.build(json)
+      end
+    end
+  end
+end
diff --git a/lib/jira/resource/issue_picker_suggestions_issue.rb b/lib/jira/resource/issue_picker_suggestions_issue.rb
new file mode 100644
index 0000000..4d54c90
--- /dev/null
+++ b/lib/jira/resource/issue_picker_suggestions_issue.rb
@@ -0,0 +1,10 @@
+module JIRA
+  module Resource
+    class IssuePickerSuggestionsIssueFactory < JIRA::BaseFactory # :nodoc:
+    end
+
+    class IssuePickerSuggestionsIssue < JIRA::Base
+      has_many :issues, class: JIRA::Resource::SuggestedIssue
+    end
+  end
+end
diff --git a/lib/jira/resource/suggested_issue.rb b/lib/jira/resource/suggested_issue.rb
new file mode 100644
index 0000000..7fe7d00
--- /dev/null
+++ b/lib/jira/resource/suggested_issue.rb
@@ -0,0 +1,9 @@
+module JIRA
+  module Resource
+    class SuggestedIssueFactory < JIRA::BaseFactory # :nodoc:
+    end
+
+    class SuggestedIssue < JIRA::Base
+    end
+  end
+end
diff --git a/lib/jira/version.rb b/lib/jira/version.rb
index bd3da13..179f288 100644
--- a/lib/jira/version.rb
+++ b/lib/jira/version.rb
@@ -1,3 +1,3 @@
 module JIRA
-  VERSION = '2.1.5'.freeze
+  VERSION = '2.2.0'.freeze
 end
diff --git a/spec/jira/resource/issue_picker_suggestions_spec.rb b/spec/jira/resource/issue_picker_suggestions_spec.rb
new file mode 100644
index 0000000..b6826a6
--- /dev/null
+++ b/spec/jira/resource/issue_picker_suggestions_spec.rb
@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe JIRA::Resource::IssuePickerSuggestions do
+  let(:client) do
+    double('client', options: {
+      rest_base_path: '/jira/rest/api/2'
+    })
+  end
+
+  describe 'relationships' do
+    subject do
+      JIRA::Resource::IssuePickerSuggestions.new(client, attrs: {
+        'sections' => [{ 'id' => 'hs'}, { 'id' => 'cs' }]
+      })
+    end
+
+    it 'has the correct relationships' do
+      expect(subject).to have_many(:sections, JIRA::Resource::IssuePickerSuggestionsIssue)
+      expect(subject.sections.length).to eq(2)
+    end
+  end
+
+  describe '#all' do
+    let(:response) { double }
+    let(:issue_picker_suggestions) { double }
+
+    before do
+      allow(response).to receive(:body).and_return('{"sections":[{"id": "cs"}]}')
+      allow(client).to receive(:IssuePickerSuggestions).and_return(issue_picker_suggestions)
+      allow(issue_picker_suggestions).to receive(:build)
+    end
+
+    it 'should autocomplete issues' do
+      allow(response).to receive(:body).and_return('{"sections":[{"id": "cs"}]}')
+      expect(client).to receive(:get).with('/jira/rest/api/2/issue/picker?query=query')
+                                     .and_return(response)
+
+      expect(client).to receive(:IssuePickerSuggestions).and_return(issue_picker_suggestions)
+      expect(issue_picker_suggestions).to receive(:build).with('sections' => [{ 'id' => 'cs' }])
+
+      JIRA::Resource::IssuePickerSuggestions.all(client, 'query')
+    end
+
+    it 'should autocomplete issues with current jql' do
+      expect(client).to receive(:get).with('/jira/rest/api/2/issue/picker?query=query&currentJQL=project+%3D+PR')
+                                     .and_return(response)
+
+      JIRA::Resource::IssuePickerSuggestions.all(client, 'query', current_jql: 'project = PR')
+    end
+
+    it 'should autocomplete issues with current issue jey' do
+      expect(client).to receive(:get).with('/jira/rest/api/2/issue/picker?query=query&currentIssueKey=PR-42')
+                                     .and_return(response)
+
+      JIRA::Resource::IssuePickerSuggestions.all(client, 'query', current_issue_key: 'PR-42')
+    end
+
+    it 'should autocomplete issues with current project id' do
+      expect(client).to receive(:get).with('/jira/rest/api/2/issue/picker?query=query&currentProjectId=PR')
+                                     .and_return(response)
+
+      JIRA::Resource::IssuePickerSuggestions.all(client, 'query', current_project_id: 'PR')
+    end
+
+    it 'should autocomplete issues with show sub tasks' do
+      expect(client).to receive(:get).with('/jira/rest/api/2/issue/picker?query=query&showSubTasks=true')
+                                     .and_return(response)
+
+      JIRA::Resource::IssuePickerSuggestions.all(client, 'query', show_sub_tasks: true)
+    end
+
+    it 'should autocomplete issues with show sub tasks parent' do
+      expect(client).to receive(:get).with('/jira/rest/api/2/issue/picker?query=query&showSubTaskParent=true')
+                                     .and_return(response)
+
+      JIRA::Resource::IssuePickerSuggestions.all(client, 'query', show_sub_task_parent: true)
+    end
+  end
+end
diff --git a/spec/jira/resource/jira_picker_suggestions_issue_spec.rb b/spec/jira/resource/jira_picker_suggestions_issue_spec.rb
new file mode 100644
index 0000000..c584b87
--- /dev/null
+++ b/spec/jira/resource/jira_picker_suggestions_issue_spec.rb
@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe JIRA::Resource::IssuePickerSuggestionsIssue do
+  let(:client) { double('client') }
+
+  describe 'relationships' do
+    subject do
+      JIRA::Resource::IssuePickerSuggestionsIssue.new(client, attrs: {
+        'issues' => [{ 'id' => '1'}, { 'id' => '2' }]
+      })
+    end
+
+    it 'has the correct relationships' do
+      expect(subject).to have_many(:issues, JIRA::Resource::SuggestedIssue)
+      expect(subject.issues.length).to eq(2)
+    end
+  end
+end