diff --git a/gcc-user-accounts-Force-symlink-creation.patch b/gcc-user-accounts-Force-symlink-creation.patch
new file mode 100644
index 0000000..65aa9b9
--- /dev/null
+++ b/gcc-user-accounts-Force-symlink-creation.patch
@@ -0,0 +1,34 @@
+From 4f3035effef08e72cffea75ec8b3dd5b8051d0c7 Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Tue, 6 Mar 2018 22:02:58 -0300
+Subject: [PATCH] user-accounts: Force symlink creation
+
+So that we can run Settings more than once in GNOME Builder.
+Without the -f flag, ln errs out after these symlinks are
+created, and Builder refuses to run after that.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/107
+---
+ panels/user-accounts/meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
+index 65341410d..0b0a4fecf 100644
+--- a/panels/user-accounts/meson.build
++++ b/panels/user-accounts/meson.build
+@@ -78,9 +78,9 @@ install_data(
+ 
+ # create symlinks for legacy images to not break current images for people
+ meson.add_install_script('sh', '-c',
+-                         'for f in $DESTDIR@0@/*; do
+-                          ln -s legacy/$(basename $f) $DESTDIR@1@/$(basename $f);
+-                          done'.format(legacy_image_dir, image_dir))
++                         '''for f in $DESTDIR@0@/*; do
++                          ln -sf legacy/$(basename $f) $DESTDIR@1@/$(basename $f);
++                          done'''.format(legacy_image_dir, image_dir))
+ 
+ polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)
+ 
+-- 
+2.17.1
+
diff --git a/gnome-control-center.changes b/gnome-control-center.changes
index 5c46e9c..d4e8893 100644
--- a/gnome-control-center.changes
+++ b/gnome-control-center.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jul 23 10:31:30 UTC 2018 - dimstar@opensuse.org
+
+- Help translation-update-upstream finding the right gettext domain
+  name: pass "po gnome-control-center-2.0" to the call.
+
+-------------------------------------------------------------------
+Wed Jul 11 23:12:34 UTC 2018 - bjorn.lie@gmail.com
+
+- Add gcc-user-accounts-Force-symlink-creation.patch:
+  user-accounts: Force symlink creation. So that we can run
+  Settings more than once in GNOME Builder. Without the -f flag, ln
+  errs out after these symlinks are created, and Builder refuses to
+  run after that (glgo#GNOME/gnome-control-center#107).
+
 -------------------------------------------------------------------
 Sat Jun  2 21:22:15 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 95eb676..ec45e84 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -40,6 +40,8 @@ Patch0:         gnome-control-center-disable-error-message-for-NM.patch
 Patch1:         control-center-network-add-domain-suffix-match.patch
 # PATCH-FIX-UPSTREAM control-center-ignore-unmanaged-wifi-devices.patch bsc#1079320 glgo#GNOME/gnome-control-center#54 sckang@suse.com -- wifi: only manage Wi-Fi devices managed by NM
 Patch2:         control-center-ignore-unmanaged-wifi-devices.patch
+# PATCH-FIX-UPSTREAM gcc-user-accounts-Force-symlink-creation.patch -- user-accounts: Force symlink creation
+Patch3:         gcc-user-accounts-Force-symlink-creation.patch
 ### patches for Leap >= 15 plus SLE >= 15, but not TW
 # PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
 Patch1001:      gnome-control-center-info-never-use-gnome-software.patch
@@ -181,7 +183,8 @@ GNOME control center.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-translation-update-upstream
+%patch3 -p1
+translation-update-upstream po gnome-control-center-2.0
 
 # patches for Leap >= 15 plus SLE >= 15, but not TW
 %if 0%{?sle_version} >= 150000