diff --git a/debian/gbp.conf b/debian/gbp.conf
index c192de7539..c2a1a70485 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,2 @@
 [DEFAULT]
-component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model' ]
+component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails' ]
diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch
new file mode 100644
index 0000000000..0ebe39890a
--- /dev/null
+++ b/debian/patches/0480-embed-elasticsearch-rails.patch
@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -128,7 +128,7 @@
+ 
+ # Search
+ gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
+-gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
++gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-model'
+ gem 'elasticsearch-api',   '5.0.3'
+ gem 'aws-sdk'
+ gem 'faraday_middleware-aws-signers-v4'
diff --git a/debian/patches/series b/debian/patches/series
index fb4f62c88b..3ecc29bfac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@
 0460-embed-derailed-benchmarks.patch
 0470-relax-bootsnap.patch
 0480-embed-elasticsearch-model.patch
+0480-embed-elasticsearch-rails.patch
 0482-remove-ee-only-gems.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
diff --git a/debian/upstream-file-list b/debian/upstream-file-list
index 2c18af08d5..3b76f75fff 100644
--- a/debian/upstream-file-list
+++ b/debian/upstream-file-list
@@ -68,6 +68,7 @@ doc
 docker
 docker-compose.yml
 elasticsearch-model
+elasticsearch-rails
 fixtures
 generator_templates
 haml_lint
diff --git a/debian/watch b/debian/watch
index 53f551c114..4d18bebcb4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -17,3 +17,6 @@ https://gemwatch.debian.net/heapy .*/heapy-(.*).tar.gz ignore
 
 opts="pgpmode=none,component=elasticsearch-model" \
 https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-model-(0.1.*).tar.gz ignore
+
+opts="pgpmode=none,component=elasticsearch-model" \
+https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-rails-(0.1.*).tar.gz ignore