diff --git a/Gemfile b/Gemfile
index f52ba76681252d96c6df2eeb592f87a4cbe02f82..e37cadc128a76641fab8c819bb178f15e407adbb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,7 +82,7 @@ gem 'validates_hostname', '~> 1.0.6'
 gem 'browser', '~> 2.5'
 
 # GPG
-gem 'gpgme'
+gem 'gpgme', '~> 2.0.18'
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
diff --git a/Gemfile.lock b/Gemfile.lock
index 27730fa2cc32b9f91dfc1615a4666b293b528c94..e7873932dadbd4edb4911a35956b36786493e8e8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -313,8 +313,8 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    gpgme (2.0.13)
-      mini_portile2 (~> 2.1)
+    gpgme (2.0.18)
+      mini_portile2 (~> 2.3)
     grape (1.1.0)
       activesupport
       builder
@@ -1016,7 +1016,7 @@ DEPENDENCIES
   gon (~> 6.2)
   google-api-client (~> 0.23)
   google-protobuf (~> 3.6)
-  gpgme
+  gpgme (~> 2.0.18)
   grape (~> 1.1.0)
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index 2cd0ef3d97a2b7a4fe8385eae68242cfdbea8e02..7478e2173bd0a979f3ea6f6de240ad8d1c1b8dae 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -310,8 +310,8 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.7)
-    gpgme (2.0.13)
-      mini_portile2 (~> 2.1)
+    gpgme (2.0.18)
+      mini_portile2 (~> 2.3)
     grape (1.1.0)
       activesupport
       builder
@@ -1007,7 +1007,7 @@ DEPENDENCIES
   gon (~> 6.2)
   google-api-client (~> 0.23)
   google-protobuf (~> 3.6)
-  gpgme
+  gpgme (~> 2.0.18)
   grape (~> 1.1.0)
   grape-entity (~> 0.7.1)
   grape-path-helpers (~> 1.0)
diff --git a/changelogs/unreleased/bump_gpgme_gem.yml b/changelogs/unreleased/bump_gpgme_gem.yml
new file mode 100644
index 0000000000000000000000000000000000000000..4c0067cb824f328ba2af7cb1e0c4fe18993b10f5
--- /dev/null
+++ b/changelogs/unreleased/bump_gpgme_gem.yml
@@ -0,0 +1,5 @@
+---
+title: Bump gpgme gem version from 2.0.13 to 2.0.18
+merge_request:
+author: asaparov
+type: other