diff --git a/gnome-terminal-translate-encoding-names.patch b/gnome-terminal-translate-encoding-names.patch
new file mode 100644
index 0000000..3293219
--- /dev/null
+++ b/gnome-terminal-translate-encoding-names.patch
@@ -0,0 +1,27 @@
+From 1828cb6d523f80c2aad69b8d452825ab9f737db0 Mon Sep 17 00:00:00 2001
+From: Egmont Koblinger <egmont@gmail.com>
+Date: Wed, 18 Apr 2018 22:02:05 +0200
+Subject: prefs: editor: Translate encoding names
+
+https://bugzilla.gnome.org/show_bug.cgi?id=795358
+(cherry picked from commit 8fe4a989c5a518e16aabf9b5ea310d3b23a37e94)
+---
+ src/terminal-encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/terminal-encoding.c b/src/terminal-encoding.c
+index 5937ff4..77c4be1 100644
+--- a/src/terminal-encoding.c
++++ b/src/terminal-encoding.c
+@@ -230,7 +230,7 @@ terminal_encodings_list_store_new (int column_id,
+ 
+   for (guint i = 0; i < G_N_ELEMENTS (encodings); i++) {
+     gs_free char *name = g_strdup_printf ("%s " EM_DASH " %s",
+-                                          encodings[i].name, encodings[i].charset);
++                                          _(encodings[i].name), encodings[i].charset);
+ 
+     GtkTreeIter iter;
+     gtk_list_store_insert_with_values (store, &iter, -1,
+-- 
+cgit v0.12
+
diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index 314fc55..f073b2d 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 24 15:34:58 UTC 2018 - bjorn.lie@gmail.com
+
+- Add gnome-terminal-translate-encoding-names.patch: prefs: editor:
+  Translate encoding names (bgo#795358).
+
 -------------------------------------------------------------------
 Mon Apr  9 20:32:52 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 185aebc..9f999f4 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -24,6 +24,8 @@ License:        GPL-3.0-or-later AND LGPL-2.1-or-later
 Group:          System/X11/Terminals
 URL:            https://wiki.gnome.org/Apps/Terminal
 Source:         http://download.gnome.org/sources/gnome-terminal/3.28/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-terminal-translate-encoding-names.patch bgo#795358 -- prefs: editor: Translate encoding names
+Patch0:         gnome-terminal-translate-encoding-names.patch
 BuildRequires:  fdupes
 # Needed for search provider. It should not be needed in my opionion, we have to take this up with upstream, or just provide search provider interface definition file as source.
 BuildRequires:  gnome-shell
@@ -80,7 +82,7 @@ arbitrary folders.
 %lang_package
 
 %prep
-%autosetup
+%autosetup -p1
 translation-update-upstream
 
 %build